July 2006 - Wine-Commits - list.winehq.org

appdb/include error_log.php
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26670 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 22:50:47 Modified files: include : error_log.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add logBackTrace() call to error_log class so we can determine code flow during error logging Patch: http://cvs.winehq.org/patch.py?id=26670 Old revision New revision Changes Path 1.1 1.2 +11 -0 appdb/include/error_log.php Index: appdb/include/error_log.php diff -u -p appdb/include/error_log.php:1.1 appdb/include/error_log.php:1.2 --- appdb/include/error_log.php:1.1 20 Jul 2006 3:50:47 -0000 +++ appdb/include/error_log.php 20 Jul 2006 3:50:47 -0000 @@ -31,6 +31,17 @@ class error_log '0'); } + /* get a backtrace and log it to the database */ + function logBackTrace($sDescription) + { + ob_start(); + print_r(debug_backtrace()); + $sDebugOutput = ob_get_contents(); + ob_end_clean(); + + error_log::log_error("general_error", $sDescription.' '.$sDebugOutput); + } + function getEntryCount() { $sQuery = "SELECT count(*) as cnt FROM error_log WHERE deleted = '0'";

1 0

appdb/include comment.php
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26669 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 22:19:23 Modified files: include : comment.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up variable naming in grab_comments() , use null instead of -1 for parent ID Patch: http://cvs.winehq.org/patch.py?id=26669 Old revision New revision Changes Path 1.27 1.28 +10 -10 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.27 appdb/include/comment.php:1.28 --- appdb/include/comment.php:1.27 20 Jul 2006 3:19:23 -0000 +++ appdb/include/comment.php 20 Jul 2006 3:19:23 -0000 @@ -252,22 +252,22 @@ class Comment { * grab comments for appId / versionId * if parentId is not -1 only comments for that thread are returned */ - function grab_comments($versionId, $parentId = -1) + function grab_comments($iVersionId, $iParentId = null) { /* escape input so we can use query_appdb() without concern */ - $versionId = mysql_real_escape_string($versionId); - $parentId = mysql_real_escape_string($parentId); + $iVersionId = mysql_real_escape_string($iVersionId); + $iParentId = mysql_real_escape_string($iParentId); - $extra = ""; - if($parentId != -1) - $extra = "AND parentId = $parentId "; + $sExtra = ""; + if($iParentId) + $sExtra = "AND parentId = '".$iParentId."' "; - $qstring = "SELECT from_unixtime(unix_timestamp(appComments.time), \"%W %M %D %Y, %k:%i\") as time, ". + $sQuery = "SELECT from_unixtime(unix_timestamp(appComments.time), \"%W %M %D %Y, %k:%i\") as time, ". "appComments.commentId, appComments.parentId, appComments.versionId, appComments.userId, appComments.subject, appComments.body, appVersion.appId ". - "FROM appComments, appVersion WHERE appComments.versionId = appVersion.versionId AND appComments.versionId = '$versionId' ". - $extra. + "FROM appComments, appVersion WHERE appComments.versionId = appVersion.versionId AND appComments.versionId = '".$iVersionId."' ". + $sExtra. "ORDER BY appComments.time ASC"; - $hResult = query_appdb($qstring); + $hResult = query_appdb($sQuery); return $hResult; }

1 0

appdb/include query.php
by WineHQ July 19, 2006

July 19, 2006

ChangeSet ID: 26668 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 14:20:16 Modified files: include : query.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Handle mysql transaction deadlocks more gracefully by making multiple attempts when they occur Patch: http://cvs.winehq.org/patch.py?id=26668 Old revision New revision Changes Path 1.6 1.7 +29 -4 appdb/include/query.php Index: appdb/include/query.php diff -u -p appdb/include/query.php:1.6 appdb/include/query.php:1.7 --- appdb/include/query.php:1.6 19 Jul 2006 19:20:16 -0000 +++ appdb/include/query.php 19 Jul 2006 19:20:16 -0000 @@ -2,6 +2,8 @@ $hAppdbLink = null; $hBugzillaLink = null; +define(MYSQL_DEADLOCK_ERRNO, 1213); + function query_appdb($sQuery,$sComment="") { global $hAppdbLink; @@ -12,10 +14,33 @@ function query_appdb($sQuery,$sComment=" $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS,true); mysql_select_db(APPS_DB, $hAppdbLink); } - - $hResult = mysql_query($sQuery, $hAppdbLink); - if(!$hResult) query_error($sQuery, $sComment); - return $hResult; + + $iRetries = 2; + + /* we need to retry queries that hit transaction deadlocks */ + /* as a deadlock isn't really a failure */ + while($iRetries) + { + $hResult = mysql_query($sQuery, $hAppdbLink); + if(!$hResult) + { + /* if this error isn't a deadlock OR if it is a deadlock and we've */ + /* run out of retries, report the error */ + $iErrno = mysql_errno(); + if(($iErrno != MYSQL_DEADLOCK_ERRNO) || (($iErrno == MYSQL_DEADLOCK_ERRNO) && ($iRetries <= 0))) + { + query_error($sQuery, $sComment); + return $hResult; + } + + $iRetries--; + } else + { + return $hResult; + } + } + + return NULL; } /*

1 0

appdb/include query.php
by WineHQ July 19, 2006

July 19, 2006

ChangeSet ID: 26667 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 12:34:59 Modified files: include : query.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add mysql_errno() output to error logging Patch: http://cvs.winehq.org/patch.py?id=26667 Old revision New revision Changes Path 1.5 1.6 +4 -1 appdb/include/query.php Index: appdb/include/query.php diff -u -p appdb/include/query.php:1.5 appdb/include/query.php:1.6 --- appdb/include/query.php:1.5 19 Jul 2006 17:34:59 -0000 +++ appdb/include/query.php 19 Jul 2006 17:34:59 -0000 @@ -113,7 +113,10 @@ function query_bugzilladb($sQuery,$sComm function query_error($sQuery, $sComment="") { - error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' mysql_error(): '".mysql_error()."' comment: '".$sComment."'"); + error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' ". + "mysql_errno(): '".mysql_errno()."' ". + "mysql_error(): '".mysql_error()."' ". + "comment: '".$sComment."'"); $sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to appdb admins</b></p>"; addmsg($sStatusMessage);

1 0

Juan Lang : crypt32: Implement X509_UNICODE_NAME_VALUE encoding/decoding.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: ead21189c2f1fef4aaec3a17ccb1aefb0e09cede URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ead21189c2f1fef4aaec3a1… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 19 07:44:48 2006 -0700 crypt32: Implement X509_UNICODE_NAME_VALUE encoding/decoding. --- dlls/crypt32/crypt32_private.h | 7 + dlls/crypt32/decode.c | 177 ++++++++++++++++++++ dlls/crypt32/encode.c | 351 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 201 +++++++++++++++++++++++ 4 files changed, 736 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ead21189c2f1fef4aae…

1 0

Paul Vriens : wininet: FTP_FtpRenameFileW expects a LPWININETFTPSESSIONW.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 5ede40ab5d665be378c4f6ff7854be7fd375e838 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ede40ab5d665be378c4f6f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Jul 19 12:06:07 2006 +0200 wininet: FTP_FtpRenameFileW expects a LPWININETFTPSESSIONW. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 95a186b..c2061fb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1566,7 +1566,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt } else { - r = FTP_FtpRenameFileW(hFtpSession, lpszSrc, lpszDest); + r = FTP_FtpRenameFileW(lpwfs, lpszSrc, lpszDest); } lend:

1 0

Juan Lang : msi: Implement searching parent in ACTION_AppSearchReg.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 0042c010afd390ffae4d9581070f9993c29c9eda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0042c010afd390ffae4d958… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 19 07:37:01 2006 -0700 msi: Implement searching parent in ACTION_AppSearchReg. --- dlls/msi/appsearch.c | 112 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 77 insertions(+), 35 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index ce99eac..83f8e5b 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -173,6 +173,13 @@ end: return rc; } +/* Frees any memory allocated in sig */ +static void ACTION_FreeSignature(MSISIGNATURE *sig) +{ + msi_free(sig->File); + msi_free(sig->Languages); +} + static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { @@ -284,6 +291,9 @@ static void ACTION_ConvertRegValue(DWORD } } +static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, + LPCWSTR path, int depth, LPWSTR *appValue); + static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { @@ -329,13 +339,6 @@ static UINT ACTION_AppSearchReg(MSIPACKA /* FIXME: valueName probably does too */ type = MSI_RecordGetInteger(row,5); - if ((type & 0x0f) != msidbLocatorTypeRawValue) - { - FIXME("AppSearch unimplemented for type %d (key path %s, value %s)\n", - type, debugstr_w(keyPath), debugstr_w(valueName)); - goto end; - } - switch (root) { case msidbRegistryRootClassesRoot: @@ -358,7 +361,7 @@ static UINT ACTION_AppSearchReg(MSIPACKA rc = RegOpenKeyW(rootKey, keyPath, &key); if (rc) { - TRACE("RegCreateKeyW returned %d\n", rc); + TRACE("RegOpenKeyW returned %d\n", rc); rc = ERROR_SUCCESS; goto end; } @@ -388,8 +391,19 @@ static UINT ACTION_AppSearchReg(MSIPACKA goto end; } - ACTION_ConvertRegValue(regType, value, sz, appValue); - + switch (type & 0x0f) + { + case msidbLocatorTypeDirectory: + rc = ACTION_SearchDirectory(package, sig, (LPCWSTR)value, 0, + appValue); + break; + case msidbLocatorTypeRawValue: + ACTION_ConvertRegValue(regType, value, sz, appValue); + break; + default: + FIXME("AppSearch unimplemented for type %d (key path %s, value %s)\n", + type, debugstr_w(keyPath), debugstr_w(valueName)); + } end: msi_free( value); RegCloseKey(key); @@ -744,8 +758,6 @@ static UINT ACTION_CheckDirectory(MSIPAC TRACE("directory exists, returning %s\n", debugstr_w(dir)); *appValue = strdupW(dir); } - else - *appValue = NULL; return rc; } @@ -812,6 +824,9 @@ static UINT ACTION_SearchDirectory(MSIPA return rc; } +static UINT ACTION_AppSearchSigName(MSIPACKAGE *package, LPCWSTR sigName, + MSISIGNATURE *sig, LPWSTR *appValue); + static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { @@ -830,6 +845,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAG { MSIRECORD *row = 0; WCHAR buffer[MAX_PATH], expanded[MAX_PATH]; + LPWSTR path = NULL, parent = NULL; DWORD sz; int depth; @@ -858,11 +874,12 @@ static UINT ACTION_AppSearchDr(MSIPACKAG } else if (buffer[0]) { - FIXME(": searching parent (%s) unimplemented\n", - debugstr_w(buffer)); - goto end; + MSISIGNATURE parentSig; + + rc = ACTION_AppSearchSigName(package, buffer, &parentSig, &parent); + ACTION_FreeSignature(&parentSig); } - /* no parent, now look for path */ + /* now look for path */ buffer[0] = 0; sz=sizeof(buffer)/sizeof(buffer[0]); rc = MSI_RecordGetStringW(row,3,buffer,&sz); @@ -877,9 +894,23 @@ static UINT ACTION_AppSearchDr(MSIPACKAG depth = MSI_RecordGetInteger(row,4); ACTION_ExpandAnyPath(package, buffer, expanded, sizeof(expanded) / sizeof(expanded[0])); - rc = ACTION_SearchDirectory(package, sig, expanded, depth, appValue); + if (parent) + { + path = HeapAlloc(GetProcessHeap(), 0, strlenW(parent) + + strlenW(expanded) + 1); + if (!path) + goto end; + strcpyW(path, parent); + strcatW(path, expanded); + } + else + path = expanded; + rc = ACTION_SearchDirectory(package, sig, path, depth, appValue); end: + if (path != expanded) + msi_free(path); + msi_free(parent); if (row) msiobj_release(&row->hdr); MSI_ViewClose(view); @@ -891,11 +922,34 @@ end: rc = ERROR_SUCCESS; } - TRACE("returning %d\n", rc); return rc; } +static UINT ACTION_AppSearchSigName(MSIPACKAGE *package, LPCWSTR sigName, + MSISIGNATURE *sig, LPWSTR *appValue) +{ + UINT rc; + + *appValue = NULL; + rc = ACTION_AppSearchGetSignature(package, sig, sigName); + if (rc == ERROR_SUCCESS) + { + rc = ACTION_AppSearchComponents(package, appValue, sig); + if (rc == ERROR_SUCCESS && !*appValue) + { + rc = ACTION_AppSearchReg(package, appValue, sig); + if (rc == ERROR_SUCCESS && !*appValue) + { + rc = ACTION_AppSearchIni(package, appValue, sig); + if (rc == ERROR_SUCCESS && !*appValue) + rc = ACTION_AppSearchDr(package, appValue, sig); + } + } + } + return rc; +} + /* http://msdn.microsoft.com/library/en-us/msi/setup/appsearch_table.asp * is the best reference for the AppSearch table and how it's used. */ @@ -950,30 +1004,18 @@ UINT ACTION_AppSearch(MSIPACKAGE *packag msiobj_release(&row->hdr); break; } + TRACE("Searching for Property %s, Signature_ %s\n", debugstr_w(propBuf), debugstr_w(sigBuf)); - rc = ACTION_AppSearchGetSignature(package, &sig, sigBuf); - if (rc == ERROR_SUCCESS) - { - rc = ACTION_AppSearchComponents(package, &value, &sig); - if (rc == ERROR_SUCCESS && !value) - { - rc = ACTION_AppSearchReg(package, &value, &sig); - if (rc == ERROR_SUCCESS && !value) - { - rc = ACTION_AppSearchIni(package, &value, &sig); - if (rc == ERROR_SUCCESS && !value) - rc = ACTION_AppSearchDr(package, &value, &sig); - } - } - } + + rc = ACTION_AppSearchSigName(package, sigBuf, &sig, &value); if (value) { MSI_SetPropertyW(package, propBuf, value); msi_free(value); } - msi_free( sig.File); - msi_free( sig.Languages); + + ACTION_FreeSignature(&sig); msiobj_release(&row->hdr); }

1 0

Mike McCormack : msi: Implement MsiConfigureFeatureW.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: fee5bee8112af1e326f03fcd647a2738d8c49705 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fee5bee8112af1e326f03fc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 19 17:39:04 2006 +0900 msi: Implement MsiConfigureFeatureW. --- dlls/msi/msi.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index d3da4c4..61c4d1a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1806,8 +1806,51 @@ end: */ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLSTATE eInstallState) { - FIXME("%s %s %i\n", debugstr_w(szProduct), debugstr_w(szFeature), eInstallState); - return ERROR_SUCCESS; + static const WCHAR szCostInit[] = { 'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0 }; + MSIPACKAGE *package = NULL; + UINT r; + WCHAR sourcepath[MAX_PATH], filename[MAX_PATH]; + DWORD sz; + + TRACE("%s %s %i\n", debugstr_w(szProduct), debugstr_w(szFeature), eInstallState); + + if (!szProduct || !szFeature) + return ERROR_INVALID_PARAMETER; + + r = MSI_OpenProductW( szProduct, &package ); + if (r != ERROR_SUCCESS) + return r; + + sz = sizeof(sourcepath); + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + + sz = sizeof(filename); + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + + lstrcatW( sourcepath, filename ); + + MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); + + /* FIXME: how do we figure out the default location? */ + if (eInstallState == INSTALLSTATE_DEFAULT) + eInstallState = INSTALLSTATE_LOCAL; + + r = ACTION_PerformUIAction( package, szCostInit ); + if (r != ERROR_SUCCESS) + goto end; + + r = MSI_SetFeatureStateW( package, szFeature, eInstallState); + if (r != ERROR_SUCCESS) + goto end; + + r = MSI_InstallPackage( package, sourcepath, NULL ); + +end: + msiobj_release( &package->hdr ); + + return r; } /***********************************************************************

1 0

Mike McCormack : msi: Fix the size of base 85 GUIDs.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 4642221875ecf9eac02fb20538ad5f2ff346b349 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4642221875ecf9eac02fb20… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 19 17:18:02 2006 +0900 msi: Fix the size of base 85 GUIDs. --- dlls/msi/msi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 11e552a..d3da4c4 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1117,7 +1117,7 @@ end: */ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) { - WCHAR squishProduct[GUID_SIZE], comp[39]; + WCHAR squishProduct[33], comp[GUID_SIZE]; GUID guid; LPWSTR components, p, parent_feature; UINT rc; @@ -1166,14 +1166,14 @@ INSTALLSTATE WINAPI MsiQueryFeatureState } r = INSTALLSTATE_LOCAL; - for( p = components; (*p != 2) && (lstrlenW(p) > GUID_SIZE); p += GUID_SIZE) + for( p = components; (*p != 2) && (lstrlenW(p) > 20); p += 20) { if (!decode_base85_guid( p, &guid )) { ERR("%s\n", debugstr_w(p)); break; } - StringFromGUID2(&guid, comp, 39); + StringFromGUID2(&guid, comp, GUID_SIZE); r = MsiGetComponentPathW(szProduct, comp, NULL, 0); if (r != INSTALLSTATE_LOCAL && r != INSTALLSTATE_SOURCE) {

1 0

Mike McCormack : msi: Only load the features and files tables once.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 9a9195d6e44eeb5048bf1b88e30c09d9f720b580 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a9195d6e44eeb5048bf1b8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 19 17:01:07 2006 +0900 msi: Only load the features and files tables once. --- dlls/msi/action.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c0644c..66ff965 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1315,6 +1315,9 @@ static UINT load_all_files(MSIPACKAGE *p '`','F','i','l','e','`',' ', 'O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`', 0}; + if (!list_empty(&package->files)) + return ERROR_SUCCESS; + rc = MSI_DatabaseOpenViewW(package->db, Query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1327,16 +1330,16 @@ static UINT load_all_files(MSIPACKAGE *p /* - * I am not doing any of the costing functionality yet. + * I am not doing any of the costing functionality yet. * Mostly looking at doing the Component and Feature loading * * The native MSI does A LOT of modification to tables here. Mostly adding - * a lot of temporary columns to the Feature and Component tables. + * a lot of temporary columns to the Feature and Component tables. * * note: Native msi also tracks the short filename. But I am only going to * track the long ones. Also looking at this directory table * it appears that the directory table does not get the parents - * resolved base on property only based on their entries in the + * resolved base on property only based on their entries in the * directory table. */ static UINT ACTION_CostInitialize(MSIPACKAGE *package) @@ -1353,7 +1356,7 @@ static UINT ACTION_CostInitialize(MSIPAC if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) return ERROR_SUCCESS; - + MSI_SetPropertyW(package, szCosting, szZero); MSI_SetPropertyW(package, cszRootDrive , c_colon); @@ -1361,8 +1364,11 @@ static UINT ACTION_CostInitialize(MSIPAC if (rc != ERROR_SUCCESS) return rc; - rc = MSI_IterateRecords(view, NULL, load_feature, package); - msiobj_release(&view->hdr); + if (list_empty(&package->features)) + { + rc = MSI_IterateRecords(view, NULL, load_feature, package); + msiobj_release(&view->hdr); + } load_all_files(package);

1 0