Subversion Repositories spk

Rev

Rev 197 | Rev 201 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 197 Rev 200
Line 1295... Line 1295...
1295
 
1295
 
1296
	return FILETYPE_UNKNOWN;
1296
	return FILETYPE_UNKNOWN;
1297
}
1297
}
1298
 
1298
 
1299
 
1299
 
1300
Utils::String FormatErrorString(int error, const Utils::String &rest)
1300
Utils::WString FormatErrorString(int error, const Utils::WString &rest)
1301
{
1301
{
1302
	int max = 0;
-
 
1303
	Utils::String *args = 0;
1302
	std::vector<Utils::WString> args;
1304
 
1303
 
1305
	if ( !rest.empty() )
1304
	if (!rest.empty())
1306
		args = rest.tokenise(";~", &max);
1305
		rest.tokenise(L"~";, args);
1307
 
1306
 
1308
	Utils::String errorStr;
1307
	Utils::WString errorStr;
1309
	switch ( error )
1308
	switch ( error )
1310
	{
1309
	{
1311
		case SPKINSTALL_CREATEDIRECTORY:
1310
		case SPKINSTALL_CREATEDIRECTORY:
1312
			errorStr = "Creating Directory: %1";
1311
			errorStr = L"Creating Directory: %1";
1313
			break;
1312
			break;
1314
		case SPKINSTALL_CREATEDIRECTORY_FAIL:
1313
		case SPKINSTALL_CREATEDIRECTORY_FAIL:
1315
			errorStr = "Unable to Creating Directory: %1";
1314
			errorStr = L"Unable to Creating Directory: %1";
1316
			break;
1315
			break;
1317
		case SPKINSTALL_WRITEFILE:
1316
		case SPKINSTALL_WRITEFILE:
1318
			errorStr = "Writing File: %1";
1317
			errorStr = L"Writing File: %1";
1319
			break;
1318
			break;
1320
		case SPKINSTALL_WRITEFILE_FAIL:
1319
		case SPKINSTALL_WRITEFILE_FAIL:
1321
			errorStr = "Unable to Write File: %1";
1320
			errorStr = L"Unable to Write File: %1";
1322
			break;
1321
			break;
1323
		case SPKINSTALL_DELETEFILE:
1322
		case SPKINSTALL_DELETEFILE:
1324
			errorStr = "Deleting File: %1";
1323
			errorStr = L"Deleting File: %1";
1325
			break;
1324
			break;
1326
		case SPKINSTALL_DELETEFILE_FAIL:
1325
		case SPKINSTALL_DELETEFILE_FAIL:
1327
			errorStr = "Unable to delete File: %1";
1326
			errorStr = L"Unable to delete File: %1";
1328
			break;
1327
			break;
1329
		case SPKINSTALL_REMOVEDIR:
1328
		case SPKINSTALL_REMOVEDIR:
1330
			errorStr = "Removing Directory: %1";
1329
			errorStr = L"Removing Directory: %1";
1331
			break;
1330
			break;
1332
		case SPKINSTALL_SKIPFILE:
1331
		case SPKINSTALL_SKIPFILE:
1333
			errorStr = "Skipping File (older): %1";
1332
			errorStr = L"Skipping File (older): %1";
1334
			break;
1333
			break;
1335
		case SPKINSTALL_ENABLEFILE:
1334
		case SPKINSTALL_ENABLEFILE:
1336
			errorStr = "Enabled File: %1";
1335
			errorStr = L"Enabled File: %1";
1337
			break;
1336
			break;
1338
		case SPKINSTALL_DISABLEFILE:
1337
		case SPKINSTALL_DISABLEFILE:
1339
			errorStr = "Disabled File: %1";
1338
			errorStr = L"Disabled File: %1";
1340
			break;
1339
			break;
1341
		case SPKINSTALL_ENABLEFILE_FAIL:
1340
		case SPKINSTALL_ENABLEFILE_FAIL:
1342
			errorStr = "Failed to enable File: %1";
1341
			errorStr = L"Failed to enable File: %1";
1343
			break;
1342
			break;
1344
		case SPKINSTALL_DISABLEFILE_FAIL:
1343
		case SPKINSTALL_DISABLEFILE_FAIL:
1345
			errorStr = "Failed to disable File: %1";
1344
			errorStr = L"Failed to disable File: %1";
1346
			break;
1345
			break;
1347
		case SPKINSTALL_UNINSTALL_MOVE:
1346
		case SPKINSTALL_UNINSTALL_MOVE:
1348
			errorStr = "Moving uninstall file: %1";
1347
			errorStr = L"Moving uninstall file: %1";
1349
			break;
1348
			break;
1350
		case SPKINSTALL_UNINSTALL_MOVE_FAIL:
1349
		case SPKINSTALL_UNINSTALL_MOVE_FAIL:
1351
			errorStr = "Unable to Move uninstall file: %1";
1350
			errorStr = L"Unable to Move uninstall file: %1";
1352
			break;
1351
			break;
1353
		case SPKINSTALL_UNINSTALL_COPY:
1352
		case SPKINSTALL_UNINSTALL_COPY:
1354
			errorStr = "Coping uninstall file: %1";
1353
			errorStr = L"Coping uninstall file: %1";
1355
			break;
1354
			break;
1356
		case SPKINSTALL_UNINSTALL_COPY_FAIL:
1355
		case SPKINSTALL_UNINSTALL_COPY_FAIL:
1357
			errorStr = "Unable to Copy uninstall file: %1";
1356
			errorStr = L"Unable to Copy uninstall file: %1";
1358
			break;
1357
			break;
1359
		case SPKINSTALL_UNINSTALL_REMOVE:
1358
		case SPKINSTALL_UNINSTALL_REMOVE:
1360
			errorStr = "Removing Uninstall file: %1";
1359
			errorStr = L"Removing Uninstall file: %1";
1361
			break;
1360
			break;
1362
		case SPKINSTALL_UNINSTALL_REMOVE_FAIL:
1361
		case SPKINSTALL_UNINSTALL_REMOVE_FAIL:
1363
			errorStr = "Unable to remove Uninstall file: %1";
1362
			errorStr = L"Unable to remove Uninstall file: %1";
1364
			break;
1363
			break;
1365
		case SPKINSTALL_SHARED:
1364
		case SPKINSTALL_SHARED:
1366
			errorStr = "Removing Unused Shared file: %1";
1365
			errorStr = L"Removing Unused Shared file: %1";
1367
			break;
1366
			break;
1368
		case SPKINSTALL_SHARED_FAIL:
1367
		case SPKINSTALL_SHARED_FAIL:
1369
			errorStr = "Unable to remove Unused Shared file: %1";
1368
			errorStr = L"Unable to remove Unused Shared file: %1";
1370
			break;
1369
			break;
1371
		case SPKINSTALL_ORIGINAL_BACKUP:
1370
		case SPKINSTALL_ORIGINAL_BACKUP:
1372
			errorStr = "Backing up original file: %1";
1371
			errorStr = L"Backing up original file: %1";
1373
			break;
1372
			break;
1374
		case SPKINSTALL_ORIGINAL_BACKUP_FAIL:
1373
		case SPKINSTALL_ORIGINAL_BACKUP_FAIL:
1375
			errorStr = "Unable to back up original file: %1";
1374
			errorStr = L"Unable to back up original file: %1";
1376
			break;
1375
			break;
1377
		case SPKINSTALL_ORIGINAL_RESTORE:
1376
		case SPKINSTALL_ORIGINAL_RESTORE:
1378
			errorStr = "Restoring original file: %1";
1377
			errorStr = L"Restoring original file: %1";
1379
			break;
1378
			break;
1380
		case SPKINSTALL_ORIGINAL_RESTORE_FAIL:
1379
		case SPKINSTALL_ORIGINAL_RESTORE_FAIL:
1381
			errorStr = "Unable to restore original file: %1";
1380
			errorStr = L"Unable to restore original file: %1";
1382
			break;
1381
			break;
1383
		case SPKINSTALL_FAKEPATCH:
1382
		case SPKINSTALL_FAKEPATCH:
1384
			errorStr = "Shifted fake patch: %1 to %2";
1383
			errorStr = L"Shifted fake patch: %1 to %2";
1385
			break;
1384
			break;
1386
		case SPKINSTALL_FAKEPATCH_FAIL:
1385
		case SPKINSTALL_FAKEPATCH_FAIL:
1387
			errorStr = "Unable to shift fake patch: %1 to %2";
1386
			errorStr = L"Unable to shift fake patch: %1 to %2";
1388
			break;
1387
			break;
1389
		case SPKINSTALL_AUTOTEXT:
1388
		case SPKINSTALL_AUTOTEXT:
1390
			errorStr = "Shifted text file: %1 to %2";
1389
			errorStr = L"Shifted text file: %1 to %2";
1391
			break;
1390
			break;
1392
		case SPKINSTALL_AUTOTEXT_FAIL:
1391
		case SPKINSTALL_AUTOTEXT_FAIL:
1393
			errorStr = "Unable to shift text file: %1 to %2";
1392
			errorStr = L"Unable to shift text file: %1 to %2";
1394
			break;
1393
			break;
1395
		case SPKINSTALL_MISSINGFILE:
1394
		case SPKINSTALL_MISSINGFILE:
1396
			errorStr = "File is missing: %1";
1395
			errorStr = L"File is missing: %1";
1397
			break;
1396
			break;
1398
		case SPKINSTALL_ORPHANED:
1397
		case SPKINSTALL_ORPHANED:
1399
			errorStr = "Orphaned File removed: %1";
1398
			errorStr = L"Orphaned File removed: %1";
1400
			break;
1399
			break;
1401
		case SPKINSTALL_ORPHANED_FAIL:
1400
		case SPKINSTALL_ORPHANED_FAIL:
1402
			errorStr = "Unable to remove Orphaned File: %1";
1401
			errorStr = L"Unable to remove Orphaned File: %1";
1403
			break;
1402
			break;
1404
	}
1403
	}
1405
 
1404
 
1406
	Utils::String ret = errorStr.args(args, max);
1405
	Utils::WString ret = errorStr.args(args);
1407
	CLEANSPLIT(args, max)
-
 
1408
	return ret;
1406
	return ret;
1409
}
1407
}
1410
 
1408
 
1411
 
1409
 
1412
bool C_File::CheckPCK ()
1410
bool C_File::CheckPCK ()