Module: wine Branch: master Commit: bc801f85be6d63714d6d25cb7c1811ab1e4b0ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc801f85be6d63714d6d25cb7c...
Author: Hans Leidekker hans@codeweavers.com Date: Mon Jan 16 11:41:11 2012 +0100
msi: Set the SourceDir and SOURCEDIR properties in MsiGetSourcePath.
---
dlls/msi/install.c | 16 +++------ dlls/msi/tests/package.c | 77 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 86e3979..2428ef5 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -347,16 +347,10 @@ UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, return MSI_GetTargetPath( hInstall, szFolder, &path, pcchPathBuf ); }
-static WCHAR *get_source_root( MSIDATABASE *db ) +static WCHAR *get_source_root( MSIPACKAGE *package ) { - WCHAR *path, *p; - - if ((path = msi_dup_property( db, szSourceDir ))) return path; - if ((path = msi_dup_property( db, szDatabase ))) - { - if ((p = strrchrW( path, '\' ))) p[1] = 0; - } - return path; + msi_set_sourcedir_props( package, FALSE ); + return msi_dup_property( package->db, szSourceDir ); }
WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOLDER **folder ) @@ -372,7 +366,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL /* special resolving for root dir */ if (!strcmpW( name, szTargetDir ) && !f->ResolvedSource) { - f->ResolvedSource = get_source_root( package->db ); + f->ResolvedSource = get_source_root( package ); } if (folder) *folder = f; if (f->ResolvedSource) @@ -388,7 +382,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL p = msi_resolve_source_folder( package, parent, NULL );
if (package->WordCount & msidbSumInfoSourceTypeCompressed) - path = get_source_root( package->db ); + path = get_source_root( package ); else if (package->WordCount & msidbSumInfoSourceTypeSFN) path = msi_build_directory_name( 3, p, f->SourceShortPath, NULL ); else diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9fae1d9..34d5eff 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10972,13 +10972,17 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", 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 SubDir after CostInitialize */ size = MAX_PATH; @@ -11027,6 +11031,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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); @@ -11079,6 +11090,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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); @@ -11131,6 +11149,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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); @@ -11268,6 +11293,13 @@ static void test_MsiGetSourcePath(void) /* source path nor the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, ""), "Expected "", got "%s"\n", path); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, ""), "Expected "", got "%s"\n", path); @@ -11324,13 +11356,17 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", 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 SubDir after CostInitialize */ size = MAX_PATH; @@ -11381,6 +11417,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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); @@ -11435,6 +11478,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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); @@ -11489,6 +11539,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(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); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(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);