July 2008 - Wine-commits - list.winehq.org

James Hawkins : msi: Set all folders' source paths to the root directory if the source type is compressed.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: ede4a3b598c12d971b66a3dc8e68ec2afe875fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede4a3b598c12d971b66a3dc8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:55:26 2008 -0500 msi: Set all folders' source paths to the root directory if the source type is compressed. --- dlls/msi/helpers.c | 4 +++- dlls/msi/tests/package.c | 14 ++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index c578c68..620a8da 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -325,7 +325,9 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, { path = NULL; - if (f->SourceLongPath) + if (package->WordCount & msidbSumInfoSourceTypeCompressed) + path = get_source_root( package ); + else path = build_directory_name( 3, p, f->SourceLongPath, NULL ); TRACE("source -> %s\n", debugstr_w(path)); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8e011c8..78c7675 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5676,22 +5676,16 @@ static void test_MsiGetSourcePath(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); - ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); - } + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); /* try SubDir2 after CostFinalize */ size = MAX_PATH; lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); - ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); - } + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

James Hawkins : msi: Determine the source path based on the short/ long file names bit of the Word Count summary property.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 396eea60061839b954a133e12d00e8372d8a3de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396eea60061839b954a133e12… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:55:59 2008 -0500 msi: Determine the source path based on the short/long file names bit of the Word Count summary property. --- dlls/msi/helpers.c | 2 + dlls/msi/tests/package.c | 48 ++++++++++++++------------------------------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 620a8da..aba3bd9 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -327,6 +327,8 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, if (package->WordCount & msidbSumInfoSourceTypeCompressed) path = get_source_root( package ); + else if (package->WordCount & msidbSumInfoSourceTypeSFN) + path = build_directory_name( 3, p, f->SourceShortPath, NULL ); else path = build_directory_name( 3, p, f->SourceLongPath, NULL ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 78c7675..3eca228 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5918,11 +5918,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); CreateDirectoryA("short", NULL); @@ -5931,11 +5928,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); CreateDirectoryA("long", NULL); @@ -5944,11 +5938,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "one"); @@ -5959,7 +5950,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); @@ -5971,11 +5962,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir3", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "five"); @@ -5986,11 +5974,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir4", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "seven"); @@ -6001,7 +5986,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir5", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); @@ -6013,11 +5998,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir6", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "eleven"); @@ -6028,7 +6010,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir7", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); MsiCloseHandle(hpkg);

1 0

Maarten Lankhorst : quartz: Fix end of stream handling in avi splitter.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 3376ba6113f81a420c56292f25bb5420ae2b6465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3376ba6113f81a420c56292f2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 21 19:50:07 2008 -0700 quartz: Fix end of stream handling in avi splitter. The last frame wouldn't always be sent, this fixes that. --- dlls/quartz/avisplit.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index fe6297f..e712eb9 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -180,6 +180,14 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe AVISTDINDEX_ENTRY *entry = &index->aIndex[stream->pos]; BOOL keyframe; + /* End of file */ + if (stream->index >= stream->entries) + { + ERR("END OF STREAM ON %u\n", streamnumber); + IMediaSample_Release(sample); + return S_FALSE; + } + rtSampleStart = index->qwBaseOffset; keyframe = !(entry->dwSize >> 31); rtSampleStart += entry->dwOffset; @@ -195,21 +203,21 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1 << 31)); TRACE("offset(%u) size(%u)\n", (DWORD)BYTES_FROM_MEDIATIME(rtSampleStart), (DWORD)BYTES_FROM_MEDIATIME(rtSampleStop - rtSampleStart)); - - /* End of file */ - if (stream->index >= stream->entries) - { - ERR("END OF STREAM ON %u\n", streamnumber); - IMediaSample_Release(sample); - hr = AVISplitter_SendEndOfFile(This, streamnumber); - return S_FALSE; - } } else if (This->oldindex) { DWORD flags = This->oldindex->aIndex[stream->pos].dwFlags; DWORD size = This->oldindex->aIndex[stream->pos].dwSize; BOOL keyframe; + + /* End of file */ + if (stream->index) + { + IMediaSample_Release(sample); + ERR("END OF STREAM ON %u\n", streamnumber); + return S_FALSE; + } + keyframe = !!(flags & AVIIF_KEYFRAME); rtSampleStart = MEDIATIME_FROM_BYTES(This->offset); @@ -237,15 +245,11 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe } while (stream->pos_next * sizeof(This->oldindex->aIndex[0]) < This->oldindex->cb && StreamFromFOURCC(This->oldindex->aIndex[stream->pos_next].dwChunkId) != streamnumber); - /* End of file */ - if (stream->index) + /* End of file soon */ + if (stream->pos_next * sizeof(This->oldindex->aIndex[0]) >= This->oldindex->cb) { - IMediaSample_Release(sample); stream->pos_next = 0; ++stream->index_next; - ERR("END OF STREAM ON %u\n", streamnumber); - hr = AVISplitter_SendEndOfFile(This, streamnumber); - return S_FALSE; } } else /* TODO: Generate an index automagically */ @@ -351,6 +355,8 @@ static DWORD WINAPI AVISplitter_thread_reader(LPVOID data) IMediaSample_Release(sample); if (hr == S_OK) hr = nexthr; + if (nexthr == S_FALSE) + AVISplitter_SendEndOfFile(This, streamnumber); } while (hr == S_OK); FIXME("Thread %u terminated with hr %08x!\n", streamnumber, hr);

1 0

Reece Dunn : user32: Fixed building the tests with the Vista SDK.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 115b7492beeb2504223702de91c17a5eaf75425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=115b7492beeb2504223702de9… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Jul 21 20:28:35 2008 +0100 user32: Fixed building the tests with the Vista SDK. --- dlls/user32/tests/input.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 37198d3..7227eb7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -45,6 +45,7 @@ */ #define _WIN32_WINNT 0x401 +#define _WIN32_IE 0x0500 #include <stdarg.h> #include <assert.h> diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index f899dab..60a07af 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -23,7 +23,8 @@ #include <stdio.h> #undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 /* For SPI_GETMOUSEHOVERWIDTH and more */ +#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ +#define _WIN32_IE 0x0700 #include "wine/test.h" #include "windef.h"

1 0

James Hawkins : msi: msidbFileAttributesVital has no effect on the installation of files.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 64a9e0f750f34ee5f34f31a0d46ea1484314115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a9e0f750f34ee5f34f31a0d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:53:03 2008 -0500 msi: msidbFileAttributesVital has no effect on the installation of files. --- dlls/msi/files.c | 5 ----- dlls/msi/tests/install.c | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 26248c5..842a72d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -750,11 +750,6 @@ static UINT copy_install_file(MSIFILE *file) gle = copy_file(file); TRACE("Overwriting existing file: %d\n", gle); } - else if (!(file->Attributes & msidbFileAttributesVital)) - { - TRACE("Ignoring error for nonvital\n"); - gle = ERROR_SUCCESS; - } return gle; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e81e3a5..881bb5c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4411,22 +4411,22 @@ static void test_sourcefolder(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_FAILURE, + "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, - "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest", FALSE), "File installed\n"); } RemoveDirectoryA("msitest"); r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_FAILURE, + "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, - "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest", FALSE), "File installed\n"); }

1 0

James Hawkins : msi: Test mixing short and long source paths when installing a file.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 36f282b0b16e50a2ba1710134c654e8859901115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f282b0b16e50a2ba1710134… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:53:41 2008 -0500 msi: Test mixing short and long source paths when installing a file. --- dlls/msi/tests/install.c | 397 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 396 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36f282b0b16e50a2ba171…

1 0

James Hawkins : msi: Use the newly added defines from the msidbSumInfoSourceType enumeration.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 7538f9ac193555fd2da61f59780a0e81b2812045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7538f9ac193555fd2da61f597… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:54:27 2008 -0500 msi: Use the newly added defines from the msidbSumInfoSourceType enumeration. --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 5 ----- dlls/msi/package.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cde5c98..5bb7008 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1486,7 +1486,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) } else { - file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; + file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; } if (!file->IsCompressed) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fe880c6..19abc3f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,11 +42,6 @@ #define MSITYPE_KEY 0x2000 #define MSITYPE_TEMPORARY 0x4000 -/* Word Count masks */ -#define MSIWORDCOUNT_SHORTFILENAMES 0x0001 -#define MSIWORDCOUNT_COMPRESSED 0x0002 -#define MSIWORDCOUNT_ADMINISTRATIVE 0x0004 -#define MSIWORDCOUNT_PRIVILEGES 0x0008 /* Install UI level mask for AND operation to exclude flags */ #define INSTALLUILEVEL_MASK 0x0007 diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0b9dacf..1b5f2d1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -797,7 +797,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) return NULL; } - if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE) + if (package->WordCount & msidbSumInfoSourceTypeAdminImage) msi_load_admin_properties( package ); }

1 0

James Hawkins : msi: Halt the installation with an error if a source file is missing.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 4e467ad72973af37a67148c53616c4a2a5d32cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e467ad72973af37a67148c53… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:52:14 2008 -0500 msi: Halt the installation with an error if a source file is missing. --- dlls/msi/files.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 08c1959..26248c5 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -743,12 +743,6 @@ static UINT copy_install_file(MSIFILE *file) TRACE("overwriting existing file\n"); gle = ERROR_SUCCESS; } - else if (gle == ERROR_FILE_NOT_FOUND) - { - /* FIXME: this needs to be tested, I'm pretty sure it fails */ - TRACE("Source file not found\n"); - gle = ERROR_SUCCESS; - } else if (gle == ERROR_ACCESS_DENIED) { SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL);

1 0

James Hawkins : msi: Add more tests for MsiGetSourcePath.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 45f9cb4d6221fc00f60e2911c3cf147c631465ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f9cb4d6221fc00f60e2911c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:49:48 2008 -0500 msi: Add more tests for MsiGetSourcePath. --- dlls/msi/tests/package.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d26226d..e94845e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5581,17 +5581,50 @@ static void test_shortlongsource(void) r = add_directory_entry(hdb, "'SubDir', 'TARGETDIR', 'short|long'"); ok(r == S_OK, "failed\n"); + /* CostInitialize:short */ + r = add_directory_entry(hdb, "'SubDir2', 'TARGETDIR', 'one|two'"); + ok(r == S_OK, "failed\n"); + + /* CostInitialize:long */ + r = add_directory_entry(hdb, "'SubDir3', 'TARGETDIR', 'three|four'"); + ok(r == S_OK, "failed\n"); + + /* FileCost:short */ + r = add_directory_entry(hdb, "'SubDir4', 'TARGETDIR', 'five|six'"); + ok(r == S_OK, "failed\n"); + + /* FileCost:long */ + r = add_directory_entry(hdb, "'SubDir5', 'TARGETDIR', 'seven|eight'"); + ok(r == S_OK, "failed\n"); + + /* CostFinalize:short */ + r = add_directory_entry(hdb, "'SubDir6', 'TARGETDIR', 'nine|ten'"); + ok(r == S_OK, "failed\n"); + + /* CostFinalize:long */ + r = add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); + ok(r == S_OK, "failed\n"); + hpkg = package_from_db(hdb); ok(hpkg, "failed to create package\n"); MsiCloseHandle(hdb); + CreateDirectoryA("one", NULL); + CreateDirectoryA("four", NULL); + r = MsiDoAction(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); + CreateDirectory("five", NULL); + CreateDirectory("eight", NULL); + r = MsiDoAction(hpkg, "FileCost"); ok(r == ERROR_SUCCESS, "file cost failed\n"); + CreateDirectory("nine", NULL); + CreateDirectory("twelve", NULL); + r = MsiDoAction(hpkg, "CostFinalize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5623,9 +5656,87 @@ static void test_shortlongsource(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "two"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before CostInitialize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "four"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before CostInitialize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir3", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "six"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before FileCost */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir4", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "eight"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before FileCost */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir5", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "ten"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir6", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "twelve"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir7", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + MsiCloseHandle(hpkg); RemoveDirectoryA("short"); RemoveDirectoryA("long"); + RemoveDirectoryA("one"); + RemoveDirectoryA("four"); + RemoveDirectoryA("five"); + RemoveDirectoryA("eight"); + RemoveDirectoryA("nine"); + RemoveDirectoryA("twelve"); DeleteFileA(msifile); }

1 0

James Hawkins : msi: Test getting the source path from a package with compressed files.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: e806a285ef4c961a5fa80f06834d0707120fdce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e806a285ef4c961a5fa80f068… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:50:24 2008 -0500 msi: Test getting the source path from a package with compressed files. --- dlls/msi/tests/package.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++ include/msidefs.h | 8 +++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e94845e..ec2b590 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5237,12 +5237,30 @@ static void test_complocator(void) DeleteFileA(msifile); } +static void set_suminfo_prop(MSIHANDLE db, DWORD prop, DWORD val) +{ + MSIHANDLE summary; + UINT r; + + r = MsiGetSummaryInformationA(db, NULL, 1, &summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoSetPropertyA(summary, prop, VT_I4, val, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoPersist(summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(summary); +} + static void test_MsiGetSourcePath(void) { MSIHANDLE hdb, hpkg; CHAR path[MAX_PATH]; CHAR cwd[MAX_PATH]; CHAR subsrc[MAX_PATH]; + CHAR sub2[MAX_PATH]; DWORD size; UINT r; @@ -5253,15 +5271,29 @@ static void test_MsiGetSourcePath(void) lstrcatA(subsrc, "subsource"); lstrcatA(subsrc, "\\"); + lstrcpyA(sub2, subsrc); + lstrcatA(sub2, "sub2"); + lstrcatA(sub2, "\\"); + + /* uncompressed source */ + hdb = create_package_db(); ok( hdb, "failed to create database\n"); + set_suminfo_prop(hdb, PID_WORDCOUNT, 0); + r = add_directory_entry(hdb, "'TARGETDIR', '', 'SourceDir'"); ok(r == S_OK, "failed\n"); r = add_directory_entry(hdb, "'SubDir', 'TARGETDIR', 'subtarget:subsource'"); ok(r == S_OK, "failed\n"); + r = add_directory_entry(hdb, "'SubDir2', 'SubDir', 'sub2'"); + ok(r == S_OK, "failed\n"); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS , "Failed to commit database\n"); + hpkg = package_from_db(hdb); ok(hpkg, "failed to create package\n"); @@ -5340,6 +5372,15 @@ static void test_MsiGetSourcePath(void) "Expected path to be unchanged, got \"%s\"\n", path); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* try SubDir2 */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r); + ok(!lstrcmpA(path, "kiwi"), + "Expected path to be unchanged, got \"%s\"\n", path); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + r = MsiDoAction(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "cost init failed\n"); @@ -5387,6 +5428,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after CostInitialize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "ResolveSource"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5431,6 +5480,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after ResolveSource */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "FileCost"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5467,6 +5524,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after FileCost */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "CostFinalize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5503,6 +5568,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + /* nonexistent directory */ size = MAX_PATH; lstrcpyA(path, "kiwi"); @@ -5553,6 +5626,74 @@ static void test_MsiGetSourcePath(void) ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); MsiCloseHandle(hpkg); + + /* compressed source */ + + r = MsiOpenDatabase(msifile, MSIDBOPEN_DIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + set_suminfo_prop(hdb, PID_WORDCOUNT, msidbSumInfoSourceTypeCompressed); + + hpkg = package_from_db(hdb); + ok(hpkg, "failed to create package\n"); + + r = MsiDoAction(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDoAction(hpkg, "FileCost"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDoAction(hpkg, "CostFinalize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try TARGETDIR after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "TARGETDIR", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + /* try SourceDir after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + /* try SOURCEDIR after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + /* try SubDir after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + /* try SubDir2 after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + MsiCloseHandle(hpkg); DeleteFile(msifile); } diff --git a/include/msidefs.h b/include/msidefs.h index 12b607d..141e203 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -207,6 +207,14 @@ enum msidbAssemblyAttributes msidbAssemblyAttributesWin32 = 0x00000001, }; +enum msidbSumInfoSourceType +{ + msidbSumInfoSourceTypeSFN = 0x00000001, + msidbSumInfoSourceTypeCompressed = 0x00000002, + msidbSumInfoSourceTypeAdminImage = 0x00000004, + msidbSumInfoSourceTypeLUAPackage = 0x00000008, +}; + /* * Windows SDK braindamage alert *

1 0