Hans Leidekker : msi: Treat an empty install location as missing.
Alexandre Julliard
julliard at winehq.org
Tue May 7 15:54:05 CDT 2013
Module: wine
Branch: master
Commit: b98ef8f087c0c4a75af6dcf6cb214f5e976594ab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98ef8f087c0c4a75af6dcf6cb214f5e976594ab
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue May 7 15:00:55 2013 +0200
msi: Treat an empty install location as missing.
---
dlls/msi/action.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 827a0c8..cf03fa2 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2305,9 +2305,12 @@ static WCHAR *get_install_location( MSIPACKAGE *package )
WCHAR *path;
if (!package->ProductCode) return NULL;
- if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ))
- return NULL;
- path = msi_reg_get_val_str( hkey, szInstallLocation );
+ if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) return NULL;
+ if ((path = msi_reg_get_val_str( hkey, szInstallLocation )) && !path[0])
+ {
+ msi_free( path );
+ path = NULL;
+ }
RegCloseKey( hkey );
return path;
}
More information about the wine-cvs
mailing list