equal
deleted
inserted
replaced
393 iResult->iIntValue2 = 0; |
393 iResult->iIntValue2 = 0; |
394 |
394 |
395 TRAPD( err, DoInstallThemeL(aManifestFileName) ); |
395 TRAPD( err, DoInstallThemeL(aManifestFileName) ); |
396 if( !err ) |
396 if( !err ) |
397 { |
397 { |
398 // correct headerdata is in iHeaderData set by CheckHeaderL(), check space |
398 // correct headerdata is in iHeaderData set by CheckHeaderL() |
399 const TUint bytesRequired = iHeaderData->Des().Length(); |
399 aHeaderData = iHeaderData->Des(); |
400 const TUint bytesAllocated = aHeaderData.MaxLength(); |
400 |
401 if( bytesRequired <= bytesAllocated ) |
401 // Set next phase |
402 { |
402 iInstallationPhase = EhspsPhaseCleanup; |
403 aHeaderData = iHeaderData->Des(); |
403 ret = EhspsInstallThemeSuccess; |
404 |
|
405 // Set next phase |
|
406 iInstallationPhase = EhspsPhaseCleanup; |
|
407 ret = EhspsInstallThemeSuccess; |
|
408 } |
|
409 else |
|
410 { |
|
411 err = KErrOverflow; |
|
412 iInstallationPhase = EhspsPhaseIdle; |
|
413 } |
|
414 } |
404 } |
415 else |
405 else |
416 { |
406 { |
417 #ifdef HSPS_LOG_ACTIVE |
407 #ifdef HSPS_LOG_ACTIVE |
418 if( iLogBus ) |
408 if( iLogBus ) |
1596 pluginIds[j], |
1586 pluginIds[j], |
1597 EFalse, |
1587 EFalse, |
1598 KNullDesC(), |
1588 KNullDesC(), |
1599 (TLanguage)( fullODT->OdtLanguage() ) ); |
1589 (TLanguage)( fullODT->OdtLanguage() ) ); |
1600 |
1590 |
1601 notifications.AppendL( info ); |
1591 notifications.Append( info ); |
1602 } |
1592 } |
1603 |
1593 |
1604 CleanupStack::PopAndDestroy(); // pluginIds. |
1594 CleanupStack::PopAndDestroy(); // pluginIds. |
1605 CleanupStack::PopAndDestroy( fullODT ); |
1595 CleanupStack::PopAndDestroy( fullODT ); |
1606 fullODT = NULL; |
1596 fullODT = NULL; |
1607 |
1597 |
2268 RArray<TInt> driveArray; |
2258 RArray<TInt> driveArray; |
2269 CleanupClosePushL( driveArray ); |
2259 CleanupClosePushL( driveArray ); |
2270 TInt drive = hspsServerUtil::GetEmmcDrivePath( iFsSession ); |
2260 TInt drive = hspsServerUtil::GetEmmcDrivePath( iFsSession ); |
2271 if ( drive != KErrNotFound ) |
2261 if ( drive != KErrNotFound ) |
2272 { |
2262 { |
2273 driveArray.AppendL( drive ); |
2263 driveArray.Append( drive ); |
2274 } |
2264 } |
2275 |
2265 |
2276 driveArray.AppendL( EDriveC ); |
2266 driveArray.Append( EDriveC ); |
2277 driveArray.AppendL( EDriveZ ); |
2267 driveArray.Append( EDriveZ ); |
2278 |
2268 |
2279 FindResourceFilesL( aPath, ETrue, driveArray, systemEpocLanguageCodes ); |
2269 FindResourceFilesL( aPath, ETrue, driveArray, systemEpocLanguageCodes ); |
2280 |
2270 |
2281 CleanupStack::PopAndDestroy(); // driveArray |
2271 CleanupStack::PopAndDestroy(); // driveArray |
2282 CleanupStack::PopAndDestroy( systemEpocLanguageCodes ); |
2272 CleanupStack::PopAndDestroy( systemEpocLanguageCodes ); |