diff -r 3785f754ee62 -r 5360b7ddc251 upnpframework/upnputilities/BWINS/upnputilitiesU.DEF
--- a/upnpframework/upnputilities/BWINS/upnputilitiesU.DEF	Fri Sep 17 08:31:21 2010 +0300
+++ b/upnpframework/upnputilities/BWINS/upnputilitiesU.DEF	Mon Nov 01 12:37:49 2010 +0200
@@ -1,40 +1,50 @@
-EXPORTS
-	??1CUPnPMetaDataUtility@@UAE@XZ @ 1 NONAME ; CUPnPMetaDataUtility::~CUPnPMetaDataUtility(void)
-	?AddResElementL@UpnpCdsResElementUtility@@SAXAAVCUpnpItem@@ABVTDesC16@@@Z @ 2 NONAME ; void UpnpCdsResElementUtility::AddResElementL(class CUpnpItem &, class TDesC16 const &)
-	?Album@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 3 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Album(void) const
-	?Artist@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 4 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Artist(void) const
-	?CreateItemFromFileL@UPnPMetadataFetcher@@SAPAVCUpnpItem@@ABVTDesC16@@@Z @ 5 NONAME ; class CUpnpItem * UPnPMetadataFetcher::CreateItemFromFileL(class TDesC16 const &)
-	?CreateItemFromFileLC@UPnPMetadataFetcher@@SAPAVCUpnpItem@@ABVTDesC16@@@Z @ 6 NONAME ; class CUpnpItem * UPnPMetadataFetcher::CreateItemFromFileLC(class TDesC16 const &)
-	?Date@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 7 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Date(void) const
-	?DeleteTempFilesL@UPnPCommonUtils@@SAXXZ @ 8 NONAME ; void UPnPCommonUtils::DeleteTempFilesL(void)
-	?DesC8ToInt@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 9 NONAME ; int UPnPCommonUtils::DesC8ToInt(class TDesC8 const &)
-	?FetchMetadataL@UPnPMetadataFetcher@@SAXAAVCUpnpObject@@ABVTDesC16@@@Z @ 10 NONAME ; void UPnPMetadataFetcher::FetchMetadataL(class CUpnpObject &, class TDesC16 const &)
-	?FetchMetadataL@UPnPMetadataFetcher@@SAXAAVCUpnpObject@@ABVTDesC16@@ABVTDesC8@@@Z @ 11 NONAME ; void UPnPMetadataFetcher::FetchMetadataL(class CUpnpObject &, class TDesC16 const &, class TDesC8 const &)
-	?FindContainerByTitle@UPnPCommonUtils@@SAPAVCUpnpContainer@@ABVCUpnpContainerList@@ABVTDesC8@@@Z @ 12 NONAME ; class CUpnpContainer * UPnPCommonUtils::FindContainerByTitle(class CUpnpContainerList const &, class TDesC8 const &)
-	?Genre@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 13 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Genre(void) const
-	?GetMimeTypeByExtensionL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC16@@@Z @ 14 NONAME ; class HBufC8 * UPnPCommonUtils::GetMimeTypeByExtensionL(class TDesC16 const &)
-	?IntToDesC8LC@UPnPCommonUtils@@SAPAVHBufC8@@ABH@Z @ 15 NONAME ; class HBufC8 * UPnPCommonUtils::IntToDesC8LC(int const &)
-	?IsPlaylistContainerL@UPnPCommonUtils@@SAHABVCUpnpObject@@@Z @ 16 NONAME ; int UPnPCommonUtils::IsPlaylistContainerL(class CUpnpObject const &)
-	?IsUriAbsolute@UpnpCdsResElementUtility@@SAHABVTDesC8@@@Z @ 17 NONAME ; int UpnpCdsResElementUtility::IsUriAbsolute(class TDesC8 const &)
-	?LoadMetaDataL@CUPnPMetaDataUtility@@QAEXABVTDesC16@@@Z @ 18 NONAME ; void CUPnPMetaDataUtility::LoadMetaDataL(class TDesC16 const &)
-	?MemoryCardStateL@UPnPCommonUtils@@SAHXZ @ 19 NONAME ; int UPnPCommonUtils::MemoryCardStateL(void)
-	?NewL@CUPnPConnectionMonitor@@SAPAV1@AAVMUPnPConnectionMonitorObserver@@H@Z @ 20 NONAME ; class CUPnPConnectionMonitor * CUPnPConnectionMonitor::NewL(class MUPnPConnectionMonitorObserver &, int)
-	?NewL@CUPnPMetaDataUtility@@SAPAV1@XZ @ 21 NONAME ; class CUPnPMetaDataUtility * CUPnPMetaDataUtility::NewL(void)
-	?RenameFileL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 22 NONAME ; class HBufC16 * UPnPCommonUtils::RenameFileL(class TDesC16 const &)
-	?ReplaceIllegalFilenameCharactersL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 23 NONAME ; class HBufC16 * UPnPCommonUtils::ReplaceIllegalFilenameCharactersL(class TDesC16 const &)
-	?ReplaceIllegalFilenameCharactersL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC8@@@Z @ 24 NONAME ; class HBufC8 * UPnPCommonUtils::ReplaceIllegalFilenameCharactersL(class TDesC8 const &)
-	?ReplacePlaceHolderInURIL@UPnPCommonUtils@@SAXAAVCUpnpItem@@ABVTInetAddr@@@Z @ 25 NONAME ; void UPnPCommonUtils::ReplacePlaceHolderInURIL(class CUpnpItem &, class TInetAddr const &)
-	?ResolveFileTypeL@UPnPCommonUtils@@SA?AW4TUPnPItemType@@ABVTDesC16@@@Z @ 26 NONAME ; enum TUPnPItemType UPnPCommonUtils::ResolveFileTypeL(class TDesC16 const &)
-	?ResolveMimeTypeL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC16@@@Z @ 27 NONAME ; class HBufC8 * UPnPCommonUtils::ResolveMimeTypeL(class TDesC16 const &)
-	?TTimeToUPnPDateL@UPnPCommonUtils@@SAPAVHBufC16@@VTTime@@@Z @ 28 NONAME ; class HBufC16 * UPnPCommonUtils::TTimeToUPnPDateL(class TTime)
-	?Title@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 29 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Title(void) const
-	?IsAudioSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 30 NONAME ; int UPnPCommonUtils::IsAudioSupported(class TDesC8 const &)
-	?IsImageSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 31 NONAME ; int UPnPCommonUtils::IsImageSupported(class TDesC8 const &)
-	?IsVideoSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 32 NONAME ; int UPnPCommonUtils::IsVideoSupported(class TDesC8 const &)
-	?FileExtensionByMimeTypeL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC8@@@Z @ 33 NONAME ; class HBufC16 * UPnPCommonUtils::FileExtensionByMimeTypeL(class TDesC8 const &)
-	?NotifyMediaGalleryL@UpnpGalleryNotifier@@SAXXZ @ 34 NONAME ; void UpnpGalleryNotifier::NotifyMediaGalleryL(void)
-	?DebugSimulateConnectionLostL@CUPnPConnectionMonitor@@SAXXZ @ 35 NONAME ; void CUPnPConnectionMonitor::DebugSimulateConnectionLostL(void)
-	?LoadTitleL@CUPnPMetaDataUtility@@QAEXABVTDesC16@@@Z @ 36 NONAME ; void CUPnPMetaDataUtility::LoadTitleL(class TDesC16 const &)
-	?FixListboxItemTextL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC8@@@Z @ 37 NONAME ; class HBufC8 * UPnPCommonUtils::FixListboxItemTextL(class TDesC8 const &)
-	?NewL@CUPnPPeriodic@@SAPAV1@H@Z @ 38 NONAME ; class CUPnPPeriodic * CUPnPPeriodic::NewL(int)
-
+EXPORTS
+	??1CUPnPMetaDataUtility@@UAE@XZ @ 1 NONAME ; CUPnPMetaDataUtility::~CUPnPMetaDataUtility(void)
+	??1CUPnPPathUtility@@UAE@XZ @ 2 NONAME ; CUPnPPathUtility::~CUPnPPathUtility(void)
+	?AddResElementL@UpnpCdsResElementUtility@@SAXAAVCUpnpItem@@ABVTDesC16@@@Z @ 3 NONAME ; void UpnpCdsResElementUtility::AddResElementL(class CUpnpItem &, class TDesC16 const &)
+	?Album@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 4 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Album(void) const
+	?Artist@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 5 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Artist(void) const
+	?CreateCopyPathL@CUPnPPathUtility@@QBEPAVHBufC16@@ABVCUpnpItem@@ABVCUpnpElement@@H@Z @ 6 NONAME ; class HBufC16 * CUPnPPathUtility::CreateCopyPathL(class CUpnpItem const &, class CUpnpElement const &, int) const
+	?CreateCopyPathL@CUPnPPathUtility@@QBEPAVHBufC16@@ABVCUpnpItem@@ABVCUpnpElement@@HW4TDriveNumber@@@Z @ 7 NONAME ; class HBufC16 * CUPnPPathUtility::CreateCopyPathL(class CUpnpItem const &, class CUpnpElement const &, int, enum TDriveNumber) const
+	?CreateItemFromFileL@UPnPMetadataFetcher@@SAPAVCUpnpItem@@ABVTDesC16@@@Z @ 8 NONAME ; class CUpnpItem * UPnPMetadataFetcher::CreateItemFromFileL(class TDesC16 const &)
+	?CreateItemFromFileLC@UPnPMetadataFetcher@@SAPAVCUpnpItem@@ABVTDesC16@@@Z @ 9 NONAME ; class CUpnpItem * UPnPMetadataFetcher::CreateItemFromFileLC(class TDesC16 const &)
+	?Date@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 10 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Date(void) const
+	?DeleteTempFilesL@UPnPCommonUtils@@SAXXZ @ 11 NONAME ; void UPnPCommonUtils::DeleteTempFilesL(void)
+	?DesC8ToInt@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 12 NONAME ; int UPnPCommonUtils::DesC8ToInt(class TDesC8 const &)
+	?FetchMetadataL@UPnPMetadataFetcher@@SAXAAVCUpnpObject@@ABVTDesC16@@@Z @ 13 NONAME ; void UPnPMetadataFetcher::FetchMetadataL(class CUpnpObject &, class TDesC16 const &)
+	?FetchMetadataL@UPnPMetadataFetcher@@SAXAAVCUpnpObject@@ABVTDesC16@@ABVTDesC8@@@Z @ 14 NONAME ; void UPnPMetadataFetcher::FetchMetadataL(class CUpnpObject &, class TDesC16 const &, class TDesC8 const &)
+	?FileExtensionByMimeTypeL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC8@@@Z @ 15 NONAME ; class HBufC16 * UPnPCommonUtils::FileExtensionByMimeTypeL(class TDesC8 const &)
+	?FileTypeByMimeTypeL@UPnPCommonUtils@@SA?AW4TUPnPItemType@@ABVTDesC8@@@Z @ 16 NONAME ; enum TUPnPItemType UPnPCommonUtils::FileTypeByMimeTypeL(class TDesC8 const &)
+	?FindContainerByTitle@UPnPCommonUtils@@SAPAVCUpnpContainer@@ABVCUpnpContainerList@@ABVTDesC8@@@Z @ 17 NONAME ; class CUpnpContainer * UPnPCommonUtils::FindContainerByTitle(class CUpnpContainerList const &, class TDesC8 const &)
+	?FixListboxItemTextL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC8@@@Z @ 18 NONAME ; class HBufC8 * UPnPCommonUtils::FixListboxItemTextL(class TDesC8 const &)
+	?Genre@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 19 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Genre(void) const
+	?GetCopyPathDriveL@CUPnPPathUtility@@QBEXAAW4TDriveNumber@@@Z @ 20 NONAME ; void CUPnPPathUtility::GetCopyPathDriveL(enum TDriveNumber &) const
+	?GetCopyPathL@CUPnPPathUtility@@QBEPAVHBufC16@@ABVCUpnpItem@@ABVCUpnpElement@@H@Z @ 21 NONAME ; class HBufC16 * CUPnPPathUtility::GetCopyPathL(class CUpnpItem const &, class CUpnpElement const &, int) const
+	?GetCopyPathL@CUPnPPathUtility@@QBEPAVHBufC16@@ABVCUpnpItem@@ABVCUpnpElement@@HW4TDriveNumber@@@Z @ 22 NONAME ; class HBufC16 * CUPnPPathUtility::GetCopyPathL(class CUpnpItem const &, class CUpnpElement const &, int, enum TDriveNumber) const
+	?GetMimeTypeByExtensionL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC16@@@Z @ 23 NONAME ; class HBufC8 * UPnPCommonUtils::GetMimeTypeByExtensionL(class TDesC16 const &)
+	?IntToDesC8LC@UPnPCommonUtils@@SAPAVHBufC8@@ABH@Z @ 24 NONAME ; class HBufC8 * UPnPCommonUtils::IntToDesC8LC(int const &)
+	?IsAudioSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 25 NONAME ; int UPnPCommonUtils::IsAudioSupported(class TDesC8 const &)
+	?IsImageSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 26 NONAME ; int UPnPCommonUtils::IsImageSupported(class TDesC8 const &)
+	?IsPlaylistContainerL@UPnPCommonUtils@@SAHABVCUpnpObject@@@Z @ 27 NONAME ; int UPnPCommonUtils::IsPlaylistContainerL(class CUpnpObject const &)
+	?IsUriAbsolute@UpnpCdsResElementUtility@@SAHABVTDesC8@@@Z @ 28 NONAME ; int UpnpCdsResElementUtility::IsUriAbsolute(class TDesC8 const &)
+	?IsVideoSupported@UPnPCommonUtils@@SAHABVTDesC8@@@Z @ 29 NONAME ; int UPnPCommonUtils::IsVideoSupported(class TDesC8 const &)
+	?LoadMetaDataL@CUPnPMetaDataUtility@@QAEXABVTDesC16@@@Z @ 30 NONAME ; void CUPnPMetaDataUtility::LoadMetaDataL(class TDesC16 const &)
+	?LoadTitleL@CUPnPMetaDataUtility@@QAEXABVTDesC16@@@Z @ 31 NONAME ; void CUPnPMetaDataUtility::LoadTitleL(class TDesC16 const &)
+	?MemoryCardStateL@UPnPCommonUtils@@SAHXZ @ 32 NONAME ; int UPnPCommonUtils::MemoryCardStateL(void)
+	?NewL@CUPnPMetaDataUtility@@SAPAV1@XZ @ 33 NONAME ; class CUPnPMetaDataUtility * CUPnPMetaDataUtility::NewL(void)
+	?NewL@CUPnPPathUtility@@SAPAV1@XZ @ 34 NONAME ; class CUPnPPathUtility * CUPnPPathUtility::NewL(void)
+	?NewL@CUPnPPeriodic@@SAPAV1@H@Z @ 35 NONAME ; class CUPnPPeriodic * CUPnPPeriodic::NewL(int)
+	?NewLC@CUPnPPathUtility@@SAPAV1@XZ @ 36 NONAME ; class CUPnPPathUtility * CUPnPPathUtility::NewLC(void)
+	?NotifyMediaGalleryL@UpnpGalleryNotifier@@SAXXZ @ 37 NONAME ; void UpnpGalleryNotifier::NotifyMediaGalleryL(void)
+	?RemoveEmptyFoldersFromCopyPathL@CUPnPPathUtility@@SAXABVTDesC16@@@Z @ 38 NONAME ; void CUPnPPathUtility::RemoveEmptyFoldersFromCopyPathL(class TDesC16 const &)
+	?RenameFileL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 39 NONAME ; class HBufC16 * UPnPCommonUtils::RenameFileL(class TDesC16 const &)
+	?ReplaceIllegalDirNameCharactersL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 40 NONAME ; class HBufC16 * UPnPCommonUtils::ReplaceIllegalDirNameCharactersL(class TDesC16 const &)
+	?ReplaceIllegalDirNameCharactersL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC8@@@Z @ 41 NONAME ; class HBufC8 * UPnPCommonUtils::ReplaceIllegalDirNameCharactersL(class TDesC8 const &)
+	?ReplaceIllegalFilenameCharactersL@UPnPCommonUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 42 NONAME ; class HBufC16 * UPnPCommonUtils::ReplaceIllegalFilenameCharactersL(class TDesC16 const &)
+	?ReplaceIllegalFilenameCharactersL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC8@@@Z @ 43 NONAME ; class HBufC8 * UPnPCommonUtils::ReplaceIllegalFilenameCharactersL(class TDesC8 const &)
+	?ReplacePlaceHolderInURIL@UPnPCommonUtils@@SAXAAVCUpnpItem@@ABVTInetAddr@@@Z @ 44 NONAME ; void UPnPCommonUtils::ReplacePlaceHolderInURIL(class CUpnpItem &, class TInetAddr const &)
+	?ResolveFileTypeL@UPnPCommonUtils@@SA?AW4TUPnPItemType@@ABVTDesC16@@@Z @ 45 NONAME ; enum TUPnPItemType UPnPCommonUtils::ResolveFileTypeL(class TDesC16 const &)
+	?ResolveMimeTypeL@UPnPCommonUtils@@SAPAVHBufC8@@ABVTDesC16@@@Z @ 46 NONAME ; class HBufC8 * UPnPCommonUtils::ResolveMimeTypeL(class TDesC16 const &)
+	?TTimeToUPnPDateL@UPnPCommonUtils@@SAPAVHBufC16@@VTTime@@@Z @ 47 NONAME ; class HBufC16 * UPnPCommonUtils::TTimeToUPnPDateL(class TTime)
+	?Title@CUPnPMetaDataUtility@@QBEABVTDesC16@@XZ @ 48 NONAME ; class TDesC16 const & CUPnPMetaDataUtility::Title(void) const
+