November 2007 - Wine-commits

James Hawkins : msi: Downgrade an ERR to a WARN.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 0a05a874360a4af240c5cc51f8ffc10a2b61b67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a05a874360a4af240c5cc51f… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:05:43 2007 -0600 msi: Downgrade an ERR to a WARN. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 41d4a47..4cc5ed4 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -192,7 +192,7 @@ static LPWSTR deformat_environment(MSIPACKAGE* package, LPCWSTR key, } else { - ERR("Unknown environment variable %s\n", debugstr_w(key)); + WARN("Unknown environment variable %s\n", debugstr_w(key)); *chunk = 0; value = NULL; }

1 0

James Hawkins : msi: Add tests for MsiGetFileHash and clean up the existing tests.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: ef7d16c8168a511a35e0547a2b364198026e507d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7d16c8168a511a35e0547a2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 17:57:37 2007 -0600 msi: Add tests for MsiGetFileHash and clean up the existing tests. --- dlls/msi/tests/msi.c | 130 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 89 insertions(+), 41 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 446f497..40de221 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -28,17 +28,12 @@ #include "wine/test.h" -typedef struct test_MSIFILEHASHINFO { - ULONG dwFileHashInfoSize; - ULONG dwData[4]; -} test_MSIFILEHASHINFO, *test_PMSIFILEHASHINFO; - static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); static UINT (WINAPI *pMsiGetFileHashA) - (LPCSTR, DWORD, test_PMSIFILEHASHINFO); + (LPCSTR, DWORD, PMSIFILEHASHINFO); static UINT (WINAPI *pMsiOpenPackageExA) (LPCSTR, DWORD, MSIHANDLE*); static UINT (WINAPI *pMsiOpenPackageExW) @@ -229,58 +224,111 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } -static void test_filehash(void) +static void create_file(LPCSTR name, LPCSTR data, DWORD size) +{ + HANDLE file; + DWORD written; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); + WriteFile(file, data, strlen(data), &written, NULL); + + if (size) + { + SetFilePointer(file, size, NULL, FILE_BEGIN); + SetEndOfFile(file); + } + + CloseHandle(file); +} + +#define HASHSIZE sizeof(MSIFILEHASHINFO) + +static const struct +{ + LPCSTR data; + DWORD size; + MSIFILEHASHINFO hash; +} hash_data[] = +{ + { "abc", 0, + { HASHSIZE, + { 0x98500190, 0xb04fd23c, 0x7d3f96d6, 0x727fe128 }, + }, + }, + + { "C:\\Program Files\\msitest\\caesar\n", 0, + { HASHSIZE, + { 0x2b566794, 0xfd42181b, 0x2514d6e4, 0x5768b4e2 }, + }, + }, + + { "C:\\Program Files\\msitest\\caesar\n", 500, + { HASHSIZE, + { 0x58095058, 0x805efeff, 0x10f3483e, 0x0147d653 }, + }, + }, +}; + +static void test_MsiGetFileHash(void) { const char name[] = "msitest.bin"; - const char data[] = {'a','b','c'}; - HANDLE handle; UINT r; - test_MSIFILEHASHINFO hash; - DWORD count = 0; + MSIFILEHASHINFO hash; + DWORD i; if (!pMsiGetFileHashA) + { + skip("MsiGetFileHash not implemented."); return; + } - DeleteFile(name); + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); - memset(&hash, 0, sizeof hash); - r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* szFilePath is NULL */ + r = pMsiGetFileHashA(NULL, 0, &hash); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } - r = pMsiGetFileHashA(name, 0, NULL); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* szFilePath is empty */ + r = pMsiGetFileHashA("", 0, &hash); + todo_wine + { + ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); + } - memset(&hash, 0, sizeof hash); - hash.dwFileHashInfoSize = sizeof hash; + /* szFilePath is nonexistent */ r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_FILE_NOT_FOUND, "wrong error %d\n", r); - - handle = CreateFile(name, GENERIC_READ|GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_ARCHIVE, NULL); - ok(handle != INVALID_HANDLE_VALUE, "failed to create file\n"); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - WriteFile(handle, data, sizeof data, &count, NULL); - CloseHandle(handle); + /* dwOptions is non-zero */ + r = pMsiGetFileHashA(name, 1, &hash); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - memset(&hash, 0, sizeof hash); + /* pHash.dwFileHashInfoSize is not correct */ + hash.dwFileHashInfoSize = 0; r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - memset(&hash, 0, sizeof hash); - hash.dwFileHashInfoSize = sizeof hash; - r = pMsiGetFileHashA(name, 1, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* pHash is NULL */ + r = pMsiGetFileHashA(name, 0, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + for (i = 0; i < sizeof(hash_data) / sizeof(hash_data[0]); i++) + { + create_file(name, hash_data[i].data, hash_data[i].size); - ok(hash.dwFileHashInfoSize == sizeof hash, "hash size changed\n"); - ok(hash.dwData[0] == 0x98500190 && - hash.dwData[1] == 0xb04fd23c && - hash.dwData[2] == 0x7d3f96d6 && - hash.dwData[3] == 0x727fe128, "hash of abc incorrect\n"); + memset(&hash, 0, sizeof(MSIFILEHASHINFO)); + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); - DeleteFile(name); + r = pMsiGetFileHashA(name, 0, &hash); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!memcmp(&hash, &hash_data[i].hash, HASHSIZE), "Hash incorrect\n"); + + DeleteFile(name); + } } /* copied from dlls/msi/registry.c */ @@ -941,7 +989,7 @@ START_TEST(msi) test_usefeature(); test_null(); test_getcomponentpath(); - test_filehash(); + test_MsiGetFileHash(); test_MsiQueryProductState(); test_MsiQueryFeatureState(); test_MsiQueryComponentState();

1 0

James Hawkins : msi: Verify the szFilePath parameter of MsiGetFileHash.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: e10028893472cbc63489515222b5d7d67d505c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10028893472cbc6348951522… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 17:58:57 2007 -0600 msi: Verify the szFilePath parameter of MsiGetFileHash. --- dlls/msi/msi.c | 6 ++++++ dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7faccaf..72e52af 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2277,6 +2277,12 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, TRACE("%s %08x %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + if (!szFilePath) + return ERROR_INVALID_PARAMETER; + + if (!*szFilePath) + return ERROR_PATH_NOT_FOUND; + if (dwOptions) return ERROR_INVALID_PARAMETER; if (!pHash) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 40de221..2e5dc85 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -287,17 +287,11 @@ static void test_MsiGetFileHash(void) /* szFilePath is NULL */ r = pMsiGetFileHashA(NULL, 0, &hash); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* szFilePath is empty */ r = pMsiGetFileHashA("", 0, &hash); - todo_wine - { - ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); - } + ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); /* szFilePath is nonexistent */ r = pMsiGetFileHashA(name, 0, &hash);

1 0

James Hawkins : msi: Set the file contents of the file hash test file explicitly.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 6a6a21854888a51721da0a15ed2248698a9ed7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6a21854888a51721da0a15e… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:00:14 2007 -0600 msi: Set the file contents of the file hash test file explicitly. --- dlls/msi/tests/install.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b8817d9..34fc126 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -557,7 +557,7 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" "MsiFileHash\tFile_\n" - "caesar\t0\t1477005400\t-2141257985\t284379198\t21485139"; + "caesar\t0\t850433704\t-241429251\t675791761\t-1221108824"; typedef struct _msi_table { @@ -1100,24 +1100,26 @@ static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) return TRUE; } -static void create_file(const CHAR *name, DWORD size) +static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; - DWORD written, left; + DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); - WriteFile(file, "\n", strlen("\n"), &written, NULL); + WriteFile(file, data, strlen(data), &written, NULL); - left = size - lstrlen(name) - 1; + if (size) + { + SetFilePointer(file, size, NULL, FILE_BEGIN); + SetEndOfFile(file); + } - SetFilePointer(file, left, NULL, FILE_CURRENT); - SetEndOfFile(file); - CloseHandle(file); } +#define create_file(name, size) create_file_data(name, name, size) + static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -3286,7 +3288,7 @@ static void test_adminprops(void) RemoveDirectory("msitest"); } -static void create_pf(LPCSTR file, BOOL is_file) +static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) { CHAR path[MAX_PATH]; @@ -3295,11 +3297,13 @@ static void create_pf(LPCSTR file, BOOL is_file) lstrcatA(path, file); if (is_file) - create_file(path, 500); + create_file_data(path, data, 500); else CreateDirectoryA(path, NULL); } +#define create_pf(file, is_file) create_pf_data(file, file, is_file) + static void test_removefiles(void) { UINT r; @@ -3533,7 +3537,7 @@ static void test_missingcab(void) create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); create_pf("msitest", FALSE); - create_pf("msitest\\caesar", TRUE); + create_pf_data("msitest\\caesar", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); todo_wine @@ -3547,7 +3551,7 @@ static void test_missingcab(void) ok(delete_pf("msitest", FALSE), "File not installed\n"); create_pf("msitest", FALSE); - create_pf("msitest\\caesar", TRUE); + create_pf_data("msitest\\caesar", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1");

1 0

James Hawkins : msi: Check the destination file' s hash and skip that file if the hash matches.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 4160722b07c4cdd98a46cbe93b7c059c395b8864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4160722b07c4cdd98a46cbe93… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:01:19 2007 -0600 msi: Check the destination file's hash and skip that file if the hash matches. --- dlls/msi/action.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 22 ++++++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 5 +---- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3066308..89f7bd7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1394,6 +1394,41 @@ static LPWSTR folder_split_path(LPWSTR p, WCHAR ch) return p+1; } +static UINT load_file_hash(MSIPACKAGE *package, MSIFILE *file) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', + '`','M','s','i','F','i','l','e','H','a','s','h','`',' ', + 'W','H','E','R','E',' ','`','F','i','l','e','_','`',' ','=',' ','\'','%','s','\'',0}; + MSIQUERY *view = NULL; + MSIRECORD *row; + UINT r; + + TRACE("%s\n", debugstr_w(file->File)); + + r = MSI_OpenQuery(package->db, &view, query, file->File); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute(view, NULL); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewFetch(view, &row); + if (r != ERROR_SUCCESS) + goto done; + + file->hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); + file->hash.dwData[0] = MSI_RecordGetInteger(row, 3); + file->hash.dwData[1] = MSI_RecordGetInteger(row, 4); + file->hash.dwData[2] = MSI_RecordGetInteger(row, 5); + file->hash.dwData[3] = MSI_RecordGetInteger(row, 6); + +done: + if (view) msiobj_release(&view->hdr); + return r; +} + static UINT load_file(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; @@ -1444,6 +1479,8 @@ static UINT load_file(MSIRECORD *row, LPVOID param) file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; } + load_file_hash(package, file); + TRACE("File Loaded (%s)\n",debugstr_w(file->File)); list_add_tail( &package->files, &file->entry ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c50e420..6662e4a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -733,6 +733,22 @@ static UINT copy_install_file(MSIFILE *file) return gle; } +static BOOL check_dest_hash_matches(MSIFILE *file) +{ + MSIFILEHASHINFO hash; + UINT r; + + if (!file->hash.dwFileHashInfoSize) + return FALSE; + + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); + r = MsiGetFileHashW(file->TargetPath, 0, &hash); + if (r != ERROR_SUCCESS) + return FALSE; + + return !memcmp(&hash, &file->hash, sizeof(MSIFILEHASHINFO)); +} + /* * ACTION_InstallFiles() * @@ -776,6 +792,12 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; + if (check_dest_hash_matches(file)) + { + TRACE("File hashes match, not overwriting\n"); + continue; + } + if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4c7565b..d541260 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -424,6 +424,7 @@ typedef struct tagMSIFILE LPWSTR SourcePath; LPWSTR TargetPath; BOOL IsCompressed; + MSIFILEHASHINFO hash; } MSIFILE; typedef struct tagMSITEMPFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 34fc126..fd8184b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3540,10 +3540,7 @@ static void test_missingcab(void) create_pf_data("msitest\\caesar", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");

1 0

James Hawkins : msi: Only check the volume label if it' s different than the first media's volume label.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: ca9a4dc0d96f7f368ea9def4124780c8ff49e78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9a4dc0d96f7f368ea9def41… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:02:55 2007 -0600 msi: Only check the volume label if it's different than the first media's volume label. --- dlls/msi/files.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6662e4a..229525e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -62,6 +62,7 @@ struct media_info { UINT last_sequence; LPWSTR disk_prompt; LPWSTR cabinet; + LPWSTR first_volume; LPWSTR volume_label; BOOL is_continuous; BOOL is_extracted; @@ -284,6 +285,9 @@ static UINT msi_media_get_disk_info( MSIPACKAGE *package, struct media_info *mi mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); + if (!mi->first_volume) + mi->first_volume = strdupW(mi->volume_label); + ptr = strrchrW(mi->source, '\\') + 1; lstrcpyW(ptr, mi->cabinet); msiobj_release(&row->hdr); @@ -491,6 +495,7 @@ static void free_media_info( struct media_info *mi ) msi_free( mi->disk_prompt ); msi_free( mi->cabinet ); msi_free( mi->volume_label ); + msi_free( mi->first_volume ); msi_free( mi ); } @@ -563,6 +568,9 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); msiobj_release(&row->hdr); + if (!mi->first_volume) + mi->first_volume = strdupW(mi->volume_label); + source_dir = msi_dup_property(package, cszSourceDir); if (mi->cabinet && mi->cabinet[0] == '#') @@ -618,7 +626,8 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label && mi->disk_id > 1 && + lstrcmpW(mi->first_volume, mi->volume_label)) { LPWSTR source = msi_dup_property(package, cszSourceDir); BOOL matches;

1 0

Rob Shearman : comctl32: Update the version in the created version to the highest current version present on XP .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: f2efcf5f5944bad25c7f94a808770d4a1f40eb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2efcf5f5944bad25c7f94a80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:09:27 2007 +0000 comctl32: Update the version in the created version to the highest current version present on XP. We don't need to create more than one because application dependencies can be resolved using shared assemblies with higher build and revision numbers. --- dlls/comctl32/commctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 0f8ad19..4604c0e 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -74,7 +74,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); #define NAME "microsoft.windows.common-controls" #define FILE "comctl32.dll" -#define VERSION "6.0.0.0" +#define VERSION "6.0.2600.2982" #define PUBLIC_KEY "6595b64144ccf1df" #ifdef __i386__

1 0

Rob Shearman : ntdll: Shared manifests should have a less-strict version check performed when loading them as dependencies .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 542e10e44eae105d970bcfbf41362e3af417abb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542e10e44eae105d970bcfbf4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 13:46:43 2007 +0000 ntdll: Shared manifests should have a less-strict version check performed when loading them as dependencies. --- dlls/ntdll/actctx.c | 56 +++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index fe83be6..60128bc 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -144,7 +144,8 @@ struct dll_redirect enum assembly_type { APPLICATION_MANIFEST, - ASSEMBLY_MANIFEST + ASSEMBLY_MANIFEST, + ASSEMBLY_SHARED_MANIFEST, }; struct assembly @@ -1379,7 +1380,8 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (!parse_noinheritable_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) return FALSE; } - else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit) + else if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && + assembly->no_inherit) return FALSE; if (xmlstr_cmp(&elem, assemblyIdentityW)) @@ -1393,7 +1395,17 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (assembly->type == ASSEMBLY_MANIFEST && memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) { - FIXME("wrong version\n"); + FIXME("wrong version for assembly manifest\n"); + return FALSE; + } + else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && + (assembly->id.version.major != expected_ai->version.major || + assembly->id.version.minor != expected_ai->version.minor || + assembly->id.version.build < expected_ai->version.build || + (assembly->id.version.build == expected_ai->version.build && + assembly->id.version.revision < expected_ai->version.revision))) + { + FIXME("wrong version for shared assembly manifest\n"); return FALSE; } } @@ -1479,7 +1491,8 @@ static NTSTATUS parse_manifest_buffer( struct actctx_loader* acl, struct assembl } static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, const void *buffer, SIZE_T size ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + const void *buffer, SIZE_T size ) { xmlbuf_t xmlbuf; NTSTATUS status; @@ -1488,7 +1501,7 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident TRACE( "parsing manifest loaded from %s base dir %s\n", debugstr_w(filename), debugstr_w(directory) ); - if (!(assembly = add_assembly(acl->actctx, ASSEMBLY_MANIFEST))) + if (!(assembly = add_assembly(acl->actctx, shared ? ASSEMBLY_SHARED_MANIFEST : ASSEMBLY_MANIFEST))) return STATUS_SXS_CANT_GEN_ACTCTX; if (directory && !(assembly->directory = strdupW(directory))) @@ -1580,8 +1593,8 @@ static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsign } static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE hModule, - LPCWSTR resname, ULONG lang ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + HANDLE hModule, LPCWSTR resname, ULONG lang ) { NTSTATUS status; UNICODE_STRING nameW; @@ -1630,14 +1643,14 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb if (status == STATUS_SUCCESS) status = LdrAccessResource(hModule, entry, &ptr, NULL); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, ptr, entry->Size); + status = parse_manifest(acl, ai, filename, directory, shared, ptr, entry->Size); return status; } static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE file, - LPCWSTR resname, ULONG lang ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + HANDLE file, LPCWSTR resname, ULONG lang ) { HANDLE mapping; OBJECT_ATTRIBUTES attr; @@ -1672,7 +1685,7 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem if (RtlImageNtHeader(base)) /* we got a PE file */ { HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */ - status = get_manifest_in_module( acl, ai, filename, directory, module, resname, lang ); + status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); } else status = STATUS_INVALID_IMAGE_FORMAT; @@ -1681,7 +1694,7 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem } static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE file ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, HANDLE file ) { FILE_END_OF_FILE_INFORMATION info; IO_STATUS_BLOCK io; @@ -1717,7 +1730,7 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, base, info.EndOfFile.QuadPart); + status = parse_manifest(acl, ai, filename, directory, shared, base, info.EndOfFile.QuadPart); NtUnmapViewOfSection( GetCurrentProcess(), base ); return status; @@ -1765,7 +1778,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, if (!open_nt_file( &file, &nameW )) { - status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } else status = STATUS_RESOURCE_DATA_NOT_FOUND; @@ -1905,7 +1918,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit if (!open_nt_file( &handle, &path_us )) { - io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, handle); + io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, TRUE, handle); NtClose( handle ); } else io.u.Status = STATUS_NO_SUCH_FILE; @@ -1962,7 +1975,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, file, + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); break; @@ -1976,7 +1989,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); break; } @@ -2230,7 +2243,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) /* if we have a resource it's a PE file */ if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) { - status = get_manifest_in_module( &acl, NULL, NULL, directory, pActCtx->hModule, + status = get_manifest_in_module( &acl, NULL, NULL, directory, FALSE, pActCtx->hModule, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) /* FIXME: what to do if pActCtx->lpSource is set */ @@ -2239,7 +2252,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } else if (pActCtx->lpSource) { - status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, + status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, FALSE, file, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) status = get_manifest_in_associated_manifest( &acl, NULL, nameW.Buffer, directory, @@ -2249,7 +2262,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } else { - status = get_manifest_in_manifest_file( &acl, NULL, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( &acl, NULL, nameW.Buffer, directory, FALSE, file ); } if (file) NtClose( file ); @@ -2502,7 +2515,8 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle id_len = strlenW(assembly_id) + 1; if (assembly->directory) ad_len = strlenW(assembly->directory) + 1; - if (assembly->manifest.info && assembly->type == ASSEMBLY_MANIFEST) + if (assembly->manifest.info && + (assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST)) path_len = strlenW(assembly->manifest.info) + 1; len = sizeof(*afdi) + (id_len + ad_len + path_len) * sizeof(WCHAR);

1 0

Rob Shearman : kernel32: Change the shared manifest test to depend on a build number that isn' t currently published on at least XP, showing that assemblies with higher build numbers can be used.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 361a98c5610543672bdfb0dd3eabc946497d620a URL: http://source.winehq.org/git/wine.git/?a=commit;h=361a98c5610543672bdfb0dd3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:10:56 2007 +0000 kernel32: Change the shared manifest test to depend on a build number that isn't currently published on at least XP, showing that assemblies with higher build numbers can be used. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 643128d..40f8b6e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -75,7 +75,7 @@ static const char manifest4[] = "<dependency>" "<dependentAssembly>" "<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" " - "version=\"6.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">" + "version=\"6.0.1.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">" "</assemblyIdentity>" "</dependentAssembly>" "</dependency>"

1 0

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: f394970edb6de42d1f8e63caf84f496a37638ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f394970edb6de42d1f8e63caf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 16:19:58 2007 +0000 user32: Constify some variables. --- dlls/user32/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3a93121..cb60ffc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -216,7 +216,7 @@ const struct builtin_class_descr MENU_builtin_class = if (flags & (bit)) { flags &= ~(bit); MENUOUT ((text)); } \ } while (0) -static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, +static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, const char *postfix) { static const char * const hbmmenus[] = { "HBMMENU_CALLBACK", "", "HBMMENU_SYSTEM", @@ -1095,7 +1095,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, * MENU_GetMaxPopupHeight */ static UINT -MENU_GetMaxPopupHeight(LPPOPUPMENU lppop) +MENU_GetMaxPopupHeight(const POPUPMENU *lppop) { if (lppop->cyMax) return lppop->cyMax; @@ -1268,7 +1268,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, * Draw scroll arrows. */ static void -MENU_DrawScrollArrows(LPPOPUPMENU lppop, HDC hdc) +MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) { HDC hdcMem = CreateCompatibleDC(hdc); HBITMAP hOrigBitmap;

1 0