msi: OriginalDatabase is the fully-expanded path to the original package if the…

msi: OriginalDatabase is the fully-expanded path to the original package if the package is local and installed from the command line.

msi: OriginalDatabase is the fully-expanded path to the original package if the…
781e19aa · James Hawkins · Alexandre Julliard · c777d309 · 781e19aa
Commit 781e19aa authored Jan 05, 2008 by James Hawkins Committed by Alexandre Julliard Jan 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

package.c dlls/msi/package.c +8 -10

No files found.
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -932,20 +932,18 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage)
    if( file != szPackage )
        track_tempfile( package, file );

+    MSI_SetPropertyW( package, Database, db->path );
+
    if( UrlIsW( szPackage, URLIS_URL ) )
-    {
-        MSI_SetPropertyW( package, OriginalDatabase, szPackage );
-        MSI_SetPropertyW( package, Database, db->path );
-    }
-    else if( szPackage[0] != '#' )
-    {
        MSI_SetPropertyW( package, OriginalDatabase, szPackage );
-        MSI_SetPropertyW( package, Database, szPackage );
-    }
+    else if( szPackage[0] == '#' )
+        MSI_SetPropertyW( package, OriginalDatabase, db->path );
    else
    {
-        MSI_SetPropertyW( package, OriginalDatabase, db->path );
-        MSI_SetPropertyW( package, Database, db->path );
+        WCHAR fullpath[MAX_PATH];
+
+        GetFullPathNameW( szPackage, MAX_PATH, fullpath, NULL );
+        MSI_SetPropertyW( package, OriginalDatabase, fullpath );
    }

    *pPackage = package;