FCL/sf/mw/uiresources: comparison skins/AknSkins/sdcsrc/SDCReader.cpp

equal deleted inserted replaced

-:1951b3078691
+:c6286dcf6040
 #include "SDCGlobals.h"
 #include "SDCReader.h"
 #include "SDCIIDConstants.h"
 #include "SDCException.h"
+#include "SDCCompat.h"
 // Make std namespace available for compatibility
 namespace std {}
 using namespace std;
 //////////////////////////////////////////////////////////////////////
 void CSDCReader::Parse()
 {
 gInput.NextTokenAllowLF();
-if( _wcsicmp( gInput.iToken, L"SKINTYPE" ) != 0 ) UnexpectedTokenError( gInput.iToken, L"SKINTYPE" );
+if( sd_wcscasecmp( gInput.iToken, L"SKINTYPE" ) != 0 ) UnexpectedTokenError( gInput.iToken, L"SKINTYPE" );
 ParseSkintype();
 gInput.NextTokenAllowLF();
-if( _wcsicmp( gInput.iToken, L"UID" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"UID" ) == 0 )
 {
 ParseUID();
 gInput.NextTokenAllowLF();
 }
-else if( _wcsicmp( gInput.iToken, L"PID" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"PID" ) == 0 )
 {
 ParsePID();
 gInput.NextTokenAllowLF();
 }
 else
 {
 GeneratePID();
 }
-if( _wcsicmp( gInput.iToken, L"NAME" ) != 0 ) UnexpectedTokenError( gInput.iToken, L"NAME" );
+if( sd_wcscasecmp( gInput.iToken, L"NAME" ) != 0 ) UnexpectedTokenError( gInput.iToken, L"NAME" );
 ParseName();
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"NAME" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"NAME" ) == 0 )
 {
 ParseName();
 }
-else if( _wcsicmp( gInput.iToken, L"LANGUAGEOVERRIDE" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"LANGUAGEOVERRIDE" ) == 0 )
 {
 ParseLanguageOverride();
 }
-else if( _wcsicmp( gInput.iToken, L"LANGUAGEPARENT" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"LANGUAGEPARENT" ) == 0 )
 {
 ParseParentUID();
 }
-else if( _wcsicmp( gInput.iToken, L"PROTECT" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"PROTECT" ) == 0 )
 {
 ParseProtect();
 }
-else if( _wcsicmp( gInput.iToken, L"AUTHOR" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"AUTHOR" ) == 0 )
 {
 ParseAuthor();
 }
-else if( _wcsicmp( gInput.iToken, L"COPYRIGHT" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"COPYRIGHT" ) == 0 )
 {
 ParseCopyright();
 }
-else if( _wcsicmp( gInput.iToken, L"TARGETDEVICE" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"TARGETDEVICE" ) == 0 )
 {
 ParseTargetDevice();
 }
-else if( _wcsicmp( gInput.iToken, L"TOOL" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"TOOL" ) == 0 )
 {
 ParseTool();
 }
-else if( _wcsicmp( gInput.iToken, L"BITMAP" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"BITMAP" ) == 0 )
 {
 ParseBitmap();
 }
-else if( _wcsicmp( gInput.iToken, L"COLORTABLE" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"COLORTABLE" ) == 0 )
 {
 ParseColorTable();
 }
-else if( _wcsicmp( gInput.iToken, L"FRAME" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"FRAME" ) == 0 )
 {
 ParseFrame();
 }
-else if( _wcsicmp( gInput.iToken, L"BMPANIM" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"BMPANIM" ) == 0 )
 {
 ParseBmpAnim();
 }
-else if( _wcsicmp( gInput.iToken, L"APPICON" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"APPICON" ) == 0 )
 {
 ParseAppIcon();
 }
-else if( _wcsicmp( gInput.iToken, L"PALETTE" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"PALETTE" ) == 0 )
 {
 ParsePalette();
 }
-else if( (_wcsicmp( gInput.iToken, L"SOUND" ) == 0)
+else if( (sd_wcscasecmp( gInput.iToken, L"SOUND" ) == 0)
-|| (_wcsicmp( gInput.iToken, L"STRING" ) == 0) )
+|| (sd_wcscasecmp( gInput.iToken, L"STRING" ) == 0) )
 {
 ParseString();
 }
-else if( _wcsicmp( gInput.iToken, L"SCALABLEITEM" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"SCALABLEITEM" ) == 0 )
 {
 if( !iData->IsScalable() ) throw CSDCException( ESDCContentError, "SCALABLEITEM can only be included in scalable skins" );
 ParseScalableItem();
 }
-else if( _wcsicmp( gInput.iToken, L"ANIMATION" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"ANIMATION" ) == 0 )
 {
 if( !iData->IsScalable() ) throw CSDCException( ESDCContentError, "ANIMATION can only be included in scalable skins" );
 ParseAnimation();
 }
-else if( _wcsicmp( gInput.iToken, L"BITMAPPATH" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"BITMAPPATH" ) == 0 )
 {
 ParseBitmapPath();
 }
-else if( _wcsicmp( gInput.iToken, L"RESTRICTION" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"RESTRICTION" ) == 0 )
 {
 ParseRestriction();
 }
 else
 {
 void CSDCReader::ParseSkintype()
 {
 gInput.NextToken();
-if( _wcsicmp( gInput.iToken, L"normal" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"normal" ) == 0 )
 {
 iData->iSkinType = 0x0;
 }
-else if( _wcsicmp( gInput.iToken, L"system" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"system" ) == 0 )
 {
 iData->iSkinType = 0x1;
 }
-else if( _wcsicmp( gInput.iToken, L"scalable" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"scalable" ) == 0 )
 {
 #if !defined( RD_ENHANCED_SKINNING )
 throw CSDCException( ESDCNotSupportedError, "Scalable skins not supported" );
 #endif
 iData->iSkinType = 0x80;
 throw CSDCException( ESDCParseError, "Unknown or missing parameter for SKINTYPE" );
 }
 if( gInput.NextToken() )
 {
-if( _wcsicmp( gInput.iToken, L"language=AH" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"language=AH" ) == 0 )
 {
 iData->iSkinType |= 0x102;
 }
 else
 {
 {
 if( iData->IsScalable() )
 throw CSDCException( ESDCParseError, "Language override can not be used with scalable skins" );
 gInput.NextToken();
-if( _wcsicmp( gInput.iToken, L"AH" ) != 0 )
+if( sd_wcscasecmp( gInput.iToken, L"AH" ) != 0 )
 {
 throw CSDCException( ESDCParseError, "Unknown or missing parameter for LANGUAGEOVERRIDE" );
 }
 gInput.NextToken();
 }
 void CSDCReader::ParseProtect()
 {
 gInput.NextToken();
-if( _wcsicmp( gInput.iToken, L"disablecopy" ) != 0 )
+if( sd_wcscasecmp( gInput.iToken, L"disablecopy" ) != 0 )
 {
 throw CSDCException( ESDCParseError, "Unknown or missing parameter for PROTECT" );
 }
 iData->iProtection = 1;
 void CSDCReader::ParseBitmap()
 {
 gInput.NextToken();
 bool appIcon = false;
-if( _wcsicmp( gInput.iToken, L"CLASS=appicon" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"CLASS=appicon" ) == 0 )
 {
 appIcon = true;
 gInput.NextToken();
 }
 int restriction( iData->iCurrentRestriction );
 const TSDCIIDEntry* iid = NULL;
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 iid = SDCIIDConstants::FindPlain( iidBuf );
 int maskIndex = -1;
 while( gInput.NextToken() )
 {
-if( _wcsnicmp( gInput.iToken, L"MASK=", 5 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"MASK=", 5 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 maskIndex = mbmIndex+1;
 }
-else if( _wcsnicmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 maskIndex = mbmIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"MASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 maskIndex = mbmIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"SOFTMASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"SOFTMASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 maskIndex = mbmIndex+1;
 }
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 vector<TSDCColorTableEntry> colors;
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0 )
 {
 iData->CreateColorTableDef( realIid, colors, restriction );
 return;
 }
-else if( _wcsnicmp( gInput.iToken, L"IDX=", 4 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"IDX=", 4 ) == 0 )
 {
 TSDCColorTableEntry entry;
 entry.iIndex = gInput.ConvertToNumber( gInput.iToken+4 );
 entry.iRgb = 0;
 colors.push_back( entry );
 }
-else if( _wcsnicmp( gInput.iToken, L"RGB=", 4 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"RGB=", 4 ) == 0 )
 {
 TSDCColorTableEntry entry;
 entry.iIndex = -1;
 int rgb = gInput.ConvertToNumber( gInput.iToken+4 );
 // SymbianOS actually uses BGR order
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 vector<TSDCIID> elements;
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 iData->CreateFrameDef( realIid, elements, restriction );
 return;
 }
 else
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 int flash = 0;
 bool svganim = false;
 while( gInput.NextToken() )
 {
-if( _wcsnicmp( gInput.iToken, L"INTERVAL=", 9 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"INTERVAL=", 9 ) == 0 )
 {
 interval = gInput.ConvertToNumber( gInput.iToken+9 );
 }
-else if( _wcsicmp( gInput.iToken, L"MODE=play" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MODE=play" ) == 0 )
 {
 playMode = 0;
 }
-else if( _wcsicmp( gInput.iToken, L"MODE=cycle" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MODE=cycle" ) == 0 )
 {
 playMode = 1;
 }
-else if( _wcsicmp( gInput.iToken, L"MODE=bounce" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MODE=bounce" ) == 0 )
 {
 playMode = 2;
 }
-else if( _wcsicmp( gInput.iToken, L"MODE=svganim" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MODE=svganim" ) == 0 )
 {
 playMode = 255;
 svganim = true;
 }
-else if( _wcsicmp( gInput.iToken, L"FLASH" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"FLASH" ) == 0 )
 {
 flash = 1;
 }
 else
 {
 int time = -1;
 int posx = 0;
 int posy = 0;
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsnicmp( gInput.iToken, L"TIME=", 5 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"TIME=", 5 ) == 0 )
 {
 time = gInput.ConvertToNumber( gInput.iToken+5 );
 }
-else if( _wcsnicmp( gInput.iToken, L"POS=", 4 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"POS=", 4 ) == 0 )
 {
 wchar_t buf[512];
 wcscpy( buf, gInput.iToken+4 );
 wchar_t* p = wcsstr( buf, L"," );
 if( !p ) throw CSDCException( ESDCParseError, "No comma found in POS parameter of BMPANIM" );
 *p = 0;
 posx = gInput.ConvertToNumber( buf );
 posy = gInput.ConvertToNumber( p+1 );
 }
-else if( _wcsicmp( gInput.iToken, L"END" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0 )
 {
 iData->CreateBmpAnimDef( realIid, interval, playMode, flash, frames, restriction );
 return;
 }
 else
 void CSDCReader::ParseAppIcon()
 {
 gInput.NextToken();
 int uid;
-if( _wcsnicmp( gInput.iToken, L"UID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"UID=", 4 ) == 0 )
 {
 uid = gInput.ConvertToNumber( gInput.iToken+4 );
 }
 else
 {
 int restriction( iData->iCurrentRestriction );
 vector<TSDCIID> iconBitmaps;
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 TSDCIID realIid;
 realIid.iMajor = EAknsMajorAppIcon;
 realIid.iMinor = uid;
 iData->CreateAppIconDef( realIid, iconBitmaps, restriction );
 }
 void CSDCReader::ParsePalette()
 {
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"SCHEME=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"SCHEME=", 7 ) == 0 )
 {
 iData->iPalettePid.iPID2 = 0;
 iData->iPalettePid.iPID1 = gInput.ConvertToNumber( gInput.iToken+7 );
 }
 else
 void CSDCReader::ParseString()
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 void CSDCReader::ParseScalableItem()
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 throw CSDCException( ESDCParseError, "IID parameter expected for SCALABLEITEM" );
 }
 gInput.NextToken();
 int input = 0;
-if( _wcsnicmp( gInput.iToken, L"INPUT=", 6 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"INPUT=", 6 ) == 0 )
 {
 input = CSDCInput::ConvertToLayer( gInput.iToken+6 );
 }
-else if( _wcsnicmp( gInput.iToken, L"REFIID=", 7 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"REFIID=", 7 ) == 0 )
 {
 // Reference only
 TSDCIID refIid;
 int ignored;
 wchar_t iidBuf[512];
 throw CSDCException( ESDCParseError, "INPUT parameter expected for SCALABLEITEM" );
 }
 gInput.NextToken();
 int output = 0;
-if( _wcsnicmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
 {
 output = CSDCInput::ConvertToLayer( gInput.iToken+7 );
 }
 else
 {
 }
 vector<TSDCEffectCommand> commands;
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 iData->CreateScalableItemDef( realIid, input, output, commands, restriction );
 return;
 }
-else if( _wcsicmp( gInput.iToken, L"EFFECT" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"EFFECT" ) == 0)
 {
 TSDCEffectCommand command;
 ParseEffectCommand( command );
 commands.push_back( command );
 }
 void CSDCReader::ParseAnimation()
 {
 gInput.NextToken();
 TSDCIID realIid;
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 const TSDCIIDEntry* iid = SDCIIDConstants::FindPlain( iidBuf );
 throw CSDCException( ESDCParseError, "IID parameter expected for ANIMATION" );
 }
 gInput.NextToken();
 int input = 0;
-if( _wcsnicmp( gInput.iToken, L"INPUT=", 6 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"INPUT=", 6 ) == 0 )
 {
 input = CSDCInput::ConvertToLayer( gInput.iToken+6 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "INPUT parameter expected for ANIMATION" );
 }
 gInput.NextToken();
 int output = 0;
-if( _wcsnicmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
 {
 output = CSDCInput::ConvertToLayer( gInput.iToken+7 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "OUTPUT parameter expected for ANIMATION" );
 }
 gInput.NextToken();
 int mininterval = 0;
-if( _wcsnicmp( gInput.iToken, L"MININTERVAL=", 12 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"MININTERVAL=", 12 ) == 0 )
 {
 mininterval = CSDCInput::ConvertToNumber( gInput.iToken+12 );
 }
 else
 {
 }
 gInput.NextTokenAllowLF();
 bool morphing = false;
-if( _wcsicmp( gInput.iToken, L"MORPHING" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"MORPHING" ) == 0 )
 {
 morphing = true;
 gInput.NextTokenAllowLF();
 }
 vector<TSDCEffectCommand> preprocessCommands;
-if( _wcsicmp( gInput.iToken, L"PREPROCESS" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"PREPROCESS" ) == 0 )
 {
 bool terminated( false );
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 terminated = true;
 break;
 }
-else if( _wcsicmp( gInput.iToken, L"EFFECT" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"EFFECT" ) == 0)
 {
 TSDCEffectCommand command;
 ParseEffectCommand( command );
 preprocessCommands.push_back( command );
 }
 vector<TSDCAnimParamGroup> sizeBoundParams;
 bool terminated( false );
 do
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 terminated = true;
 break;
 }
-else if( _wcsicmp( gInput.iToken, L"COMMAND" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"COMMAND" ) == 0)
 {
 TSDCEffectCommand command;
 ParseEffectCommand( command );
 animCommands.push_back( command );
 }
-else if( _wcsicmp( gInput.iToken, L"VALUE" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"VALUE" ) == 0)
 {
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"UID=", 4 ) )
+if( sd_wcsncasecmp( gInput.iToken, L"UID=", 4 ) )
 throw new CSDCException( ESDCParseError, "UID parameter expected for VALUE" );
 int uid = CSDCInput::ConvertToNumber( gInput.iToken+4 );
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"TIMINGID=", 9 ) )
+if( sd_wcsncasecmp( gInput.iToken, L"TIMINGID=", 9 ) )
 throw new CSDCException( ESDCParseError, "TIMINGID parameter expected for VALUE" );
 int timingId = CSDCInput::ConvertToNumber( gInput.iToken+9 );
 TSDCAnimParamGroup paramGroup;
-while( gInput.NextTokenAllowLF() && _wcsicmp( gInput.iToken, L"END" ) )
+while( gInput.NextTokenAllowLF() && sd_wcscasecmp( gInput.iToken, L"END" ) )
 {
 TSDCEffectParameter parameter;
 ParseEffectParameter( parameter );
 paramGroup.iParameters.push_back( parameter );
 }
 paramGroup.iValueA = uid;
 paramGroup.iValueB = timingId;
 values.push_back( paramGroup );
 }
-else if( _wcsicmp( gInput.iToken, L"TIMINGMODEL" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"TIMINGMODEL" ) == 0)
 {
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"UID=", 4 ) )
+if( sd_wcsncasecmp( gInput.iToken, L"UID=", 4 ) )
 throw new CSDCException( ESDCParseError, "UID parameter expected for TIMINGMODEL" );
 int uid = CSDCInput::ConvertToNumber( gInput.iToken+4 );
 TSDCAnimParamGroup paramGroup;
-while( gInput.NextTokenAllowLF() && _wcsicmp( gInput.iToken, L"END" ) )
+while( gInput.NextTokenAllowLF() && sd_wcscasecmp( gInput.iToken, L"END" ) )
 {
 TSDCEffectParameter parameter;
 ParseEffectParameter( parameter );
 paramGroup.iParameters.push_back( parameter );
 }
 paramGroup.iValueA = uid;
 paramGroup.iValueB = 0;
 timingModels.push_back( paramGroup );
 }
-else if( _wcsicmp( gInput.iToken, L"SIZEBOUNDPARAM" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"SIZEBOUNDPARAM" ) == 0)
 {
 gInput.NextToken();
 TSDCEffectParameter parameter;
 parameter.iType = 0;
 wcscpy( parameter.iName, gInput.iToken );
 parameter.iNumber = 0;
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"VALUEID=", 8 ) )
+if( sd_wcsncasecmp( gInput.iToken, L"VALUEID=", 8 ) )
 throw new CSDCException( ESDCParseError, "VALUEID parameter expected for SIZEBOUNDPARAM" );
 int valueId = CSDCInput::ConvertToNumber( gInput.iToken+8 );
 gInput.NextToken();
 int flags = 0;
-if( _wcsicmp( gInput.iToken, L"FLAGS=W" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"FLAGS=W" ) == 0 )
 {
 flags = 1;
 }
-else if( _wcsicmp( gInput.iToken, L"FLAGS=H" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"FLAGS=H" ) == 0 )
 {
 flags = 2;
 }
-else if( _wcsicmp( gInput.iToken, L"FLAGS=W_AND_H" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"FLAGS=W_AND_H" ) == 0 )
 {
 flags = 3;
 }
 else throw new CSDCException( ESDCParseError, "FLAGS=W|H|W_AND_H parameter expected for SIZEBOUNDPARAM" );
 void CSDCReader::ParseBitmapPath()
 {
 if( gInput.NextToken() )
 {
 bool changed( true );
-if( _wcsicmp( gInput.iToken, iData->iBmpPath ) == 0 ) changed = false;
+if( sd_wcscasecmp( gInput.iToken, iData->iBmpPath ) == 0 ) changed = false;
 iData->SetBmpPath( gInput.iToken );
 char buf[512];
 CSDCInput::ConvertToAscii( buf, gInput.iToken );
 if( changed )
 printf("NOTE: Bitmap source path set to %s\n", buf );
 {
 if( !iData->IsScalable() )
 printf( "WARNING: RESTRICTION elements is only allowed in scalable skins, layout types will not work with this skin (line %i)\n", gInput.iLineNumber );
 gInput.NextToken();
-if( _wcsicmp( gInput.iToken, L"S60_2_6" ) == 0 )
+if( sd_wcscasecmp( gInput.iToken, L"S60_2_6" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0206;
 printf("NOTE: Current restriction set to 2.6\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_2_7" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_2_7" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0207;
 printf("NOTE: Current restriction set to 2.7\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_2_8" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_2_8" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0208;
 printf("NOTE: Current restriction set to 2.8\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_3_0" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_3_0" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0300;
 printf("NOTE: Current restriction set to 3.0\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_3_1" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_3_1" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0301;
 printf("NOTE: Current restriction set to 3.1\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_3_2" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_3_2" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0302;
 printf("NOTE: Current restriction set to 3.2\n");
 }
-else if( _wcsicmp( gInput.iToken, L"S60_5_0" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"S60_5_0" ) == 0 )
 {
 iData->iCurrentRestriction = 0x0500;
 printf("NOTE: Current restriction set to 5.0\n");
 }
-else if( _wcsicmp( gInput.iToken, L"LAY_W" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"LAY_W" ) == 0 )
 {
 iData->iCurrentRestriction = 0x00010000;
 printf("NOTE: Current restriction set to Layout/Non-Mirrored\n");
 }
-else if( _wcsicmp( gInput.iToken, L"LAY_AH" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"LAY_AH" ) == 0 )
 {
 iData->iCurrentRestriction = 0x00020000;
 printf("NOTE: Current restriction set to Layout/Mirrored\n");
 }
-else if( _wcsnicmp( gInput.iToken, L"LANG=", 5 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"LANG=", 5 ) == 0 )
 {
 int language = (CSDCInput::ConvertToNumber( gInput.iToken+5 ))&0xffff;
 printf("NOTE: Current restriction set to Language/langcode:%d\n", language);
 iData->iCurrentRestriction = language|0x00030000;
 iData->iLanguageVector.push_back(language|0x00030000);
 }
-else if( _wcsicmp( gInput.iToken, L"NONE" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"NONE" ) == 0 )
 {
 iData->iCurrentRestriction = 0;
 printf("NOTE: Current restriction cleared\n");
 }
 else
 }
 TSDCIID CSDCReader::ParseBitmapSource( const bool aAppIcon, const int aRestriction, const bool aSvgAnim )
 {
 int restriction( iData->iCurrentRestriction );
-if( _wcsnicmp( gInput.iToken, L"IID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"IID=", 4 ) == 0 )
 {
 wchar_t iidBuf[512];
 wcscpy( iidBuf, gInput.iToken+4 );
 StripIIDPrefix( iidBuf, restriction );
 char buf[512];
 int maskIndex = -1;
 while( gInput.NextToken() )
 {
-if( _wcsnicmp( gInput.iToken, L"MASK=", 5 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"MASK=", 5 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 maskIndex = mbmIndex+1;
 }
-else if( _wcsnicmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 maskIndex = mbmIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"MASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 maskIndex = mbmIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"SOFTMASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"SOFTMASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 maskIndex = mbmIndex+1;
 }
 void CSDCReader::ProcessAttribute( TSDCImageAttributes& aAttributes, wchar_t* aSource )
 {
 wchar_t buf[512];
 wcscpy( buf, aSource );
-if( _wcsnicmp( buf, L"COORDS=", 7 ) == 0 )
+if( sd_wcsncasecmp( buf, L"COORDS=", 7 ) == 0 )
 {
 wchar_t* p = wcsstr( buf, L"," );
 if( !p ) throw CSDCException( ESDCParseError, "No comma in image attribute COORDS" );
 *p = 0;
 aAttributes.iAttributeFlags |= ESDCImageAttributeCoords;
 aAttributes.iCoordX = gInput.ConvertToNumber( buf+7 );
 aAttributes.iCoordY = gInput.ConvertToNumber( p+1 );
 }
-else if( _wcsnicmp( buf, L"SIZE=", 5 ) == 0 )
+else if( sd_wcsncasecmp( buf, L"SIZE=", 5 ) == 0 )
 {
 wchar_t* p = wcsstr( buf, L"," );
 if( !p ) throw CSDCException( ESDCParseError, "No comma in image attribute SIZE" );
 *p = 0;
 aAttributes.iAttributeFlags |= ESDCImageAttributeSize;
 aAttributes.iSizeW = gInput.ConvertToNumber( buf+5 );
 aAttributes.iSizeH  = gInput.ConvertToNumber( p+1 );
 }
-else if( _wcsicmp( buf, L"STRETCH" ) == 0 )
+else if( sd_wcscasecmp( buf, L"STRETCH" ) == 0 )
 {
 aAttributes.iAttributeFlags |= ESDCImageAttributeStretch;
 }
-else if( _wcsicmp( buf, L"TILE" ) == 0 )
+else if( sd_wcscasecmp( buf, L"TILE" ) == 0 )
 {
 aAttributes.iAttributeFlags |= ESDCImageAttributeTile;
 }
-else if( _wcsicmp( buf, L"TILEX" ) == 0 )
+else if( sd_wcscasecmp( buf, L"TILEX" ) == 0 )
 {
 aAttributes.iAttributeFlags |= ESDCImageAttributeTileX;
 }
-else if( _wcsicmp( buf, L"TILEY" ) == 0 )
+else if( sd_wcscasecmp( buf, L"TILEY" ) == 0 )
 {
 aAttributes.iAttributeFlags |= ESDCImageAttributeTileY;
 }
-else if( _wcsnicmp( buf, L"ALIGN=", 6 ) == 0 )
+else if( sd_wcsncasecmp( buf, L"ALIGN=", 6 ) == 0 )
 {
-if( _wcsicmp( buf+6, L"TL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTL;
+if( sd_wcscasecmp( buf+6, L"TL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTL;
-else if( _wcsicmp( buf+6, L"TC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTC;
+else if( sd_wcscasecmp( buf+6, L"TC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTC;
-else if( _wcsicmp( buf+6, L"TR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTR;
+else if( sd_wcscasecmp( buf+6, L"TR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignTR;
-else if( _wcsicmp( buf+6, L"CL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCL;
+else if( sd_wcscasecmp( buf+6, L"CL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCL;
-else if( _wcsicmp( buf+6, L"CC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCC;
+else if( sd_wcscasecmp( buf+6, L"CC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCC;
-else if( _wcsicmp( buf+6, L"CR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCR;
+else if( sd_wcscasecmp( buf+6, L"CR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignCR;
-else if( _wcsicmp( buf+6, L"BL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBL;
+else if( sd_wcscasecmp( buf+6, L"BL" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBL;
-else if( _wcsicmp( buf+6, L"BC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBC;
+else if( sd_wcscasecmp( buf+6, L"BC" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBC;
-else if( _wcsicmp( buf+6, L"BR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBR;
+else if( sd_wcscasecmp( buf+6, L"BR" ) == 0 ) aAttributes.iAlignmentFlags = ESDCImageAlignBR;
 else throw CSDCException( ESDCParseError, "Unknown parameter for image attribute ALIGN" );
 aAttributes.iAttributeFlags |= ESDCImageAttributeAlign;
 }
 else throw CSDCException( ESDCParseError, "Unknown attribute parameter" );
 }
 void CSDCReader::ParseEffectCommand( TSDCEffectCommand& aCommand )
 {
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"UID=", 4 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"UID=", 4 ) == 0 )
 {
 aCommand.iUid = CSDCInput::ConvertToNumber( gInput.iToken+4 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "UID parameter expected for EFFECT" );
 }
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"INPUTA=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"INPUTA=", 7 ) == 0 )
 {
 aCommand.iInputA = CSDCInput::ConvertToLayer( gInput.iToken+7 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "INPUTA parameter expected for EFFECT" );
 }
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"INPUTB=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"INPUTB=", 7 ) == 0 )
 {
 aCommand.iInputB = CSDCInput::ConvertToLayer( gInput.iToken+7 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "INPUTB parameter expected for EFFECT" );
 }
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"OUTPUT=", 7 ) == 0 )
 {
 aCommand.iOutput = CSDCInput::ConvertToLayer( gInput.iToken+7 );
 }
 else
 {
 throw CSDCException( ESDCParseError, "OUTPUT parameter expected for EFFECT" );
 }
 while( gInput.NextTokenAllowLF() )
 {
-if( _wcsicmp( gInput.iToken, L"END" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"END" ) == 0)
 {
 // Just return, everything should be in the struct by now
 return;
 }
 else
 throw CSDCException( ESDCParseError, "No END token for EFFECT" );
 }
 void CSDCReader::ParseEffectParameter( TSDCEffectParameter& aParameter )
 {
-if( _wcsicmp( gInput.iToken, L"INT" ) == 0)
+if( sd_wcscasecmp( gInput.iToken, L"INT" ) == 0)
 {
 aParameter.iType = 0;
 }
-else if( _wcsicmp( gInput.iToken, L"STR" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"STR" ) == 0)
 {
 aParameter.iType = 1;
 }
-else if( _wcsicmp( gInput.iToken, L"BMP" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"BMP" ) == 0)
 {
 aParameter.iType = 2;
 }
-else if( _wcsicmp( gInput.iToken, L"NAMEDREF" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"NAMEDREF" ) == 0)
 {
 aParameter.iType = 3;
 }
-else if( _wcsicmp( gInput.iToken, L"RAW" ) == 0)
+else if( sd_wcscasecmp( gInput.iToken, L"RAW" ) == 0)
 {
 aParameter.iType = 4;
 }
 else
 {
 // Mask
 aParameter.iMaskIndex = -1;
 if( gInput.NextToken() )
 {
-if( _wcsnicmp( gInput.iToken, L"MASK=", 5 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"MASK=", 5 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 aParameter.iMaskIndex = aParameter.iBmpIndex+1;
 }
-else if( _wcsnicmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
+else if( sd_wcsncasecmp( gInput.iToken, L"SOFTMASK=", 9 ) == 0 )
 {
 if( svg ) throw CSDCException( ESDCParseError, "SVG icon can not have a named mask" );
 if( mbmEntry->iMaskColorDepth!=ESDCColorDepthNone )
 {
 printf("NOTE: Mask already defined, second definition ignored (line %i)\n", gInput.iLineNumber );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 wcscpy( mbmEntry->iMaskSourceFilename, maskFile );
 }
 aParameter.iMaskIndex = aParameter.iBmpIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"MASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"MASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth1;
 aParameter.iMaskIndex = aParameter.iBmpIndex+1;
 }
-else if( _wcsicmp( gInput.iToken, L"SOFTMASK" ) == 0 )
+else if( sd_wcscasecmp( gInput.iToken, L"SOFTMASK" ) == 0 )
 {
 if( !svg ) throw CSDCException( ESDCParseError, "Non-SVG icon can not have an unnamed mask" );
 mbmEntry->iMaskColorDepth = ESDCColorDepth8;
 aParameter.iMaskIndex = aParameter.iBmpIndex+1;
 }
 }
 }
 else if( aParameter.iType == 3 )
 {
 gInput.NextToken();
-if( _wcsnicmp( gInput.iToken, L"VALUEID=", 8 ) == 0 )
+if( sd_wcsncasecmp( gInput.iToken, L"VALUEID=", 8 ) == 0 )
 {
 aParameter.iNumber = CSDCInput::ConvertToNumber( gInput.iToken+8 );
 }
 else
 {
 wchar_t buf[512];
 wcscpy( buf, delimiter+1 );
 *delimiter = 0;
-if( _wcsicmp( aIID, L"S60_2_6" ) == 0 )
+if( sd_wcscasecmp( aIID, L"S60_2_6" ) == 0 )
 {
 aRestriction = 0x0206;
 }
-else if( _wcsicmp( aIID, L"S60_2_7" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_2_7" ) == 0 )
 {
 aRestriction = 0x0207;
 }
-else if( _wcsicmp( aIID, L"S60_2_8" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_2_8" ) == 0 )
 {
 aRestriction = 0x0208;
 }
-else if( _wcsicmp( aIID, L"S60_3_0" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_3_0" ) == 0 )
 {
 aRestriction = 0x0300;
 }
-else if( _wcsicmp( aIID, L"S60_3_1" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_3_1" ) == 0 )
 {
 aRestriction = 0x0301;
 }
-else if( _wcsicmp( aIID, L"S60_3_2" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_3_2" ) == 0 )
 {
 aRestriction = 0x0302;
 }
-else if( _wcsicmp( aIID, L"S60_5_0" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"S60_5_0" ) == 0 )
 {
 aRestriction = 0x0500;
 }
-else if( _wcsicmp( aIID, L"LAY_W" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"LAY_W" ) == 0 )
 {
 aRestriction = 0x00010000;
 }
-else if( _wcsicmp( aIID, L"LAY_AH" ) == 0 )
+else if( sd_wcscasecmp( aIID, L"LAY_AH" ) == 0 )
 {
 aRestriction = 0x00020000;
 }
 else
 {

changeset 50	c6286dcf6040
parent 0	05e9090e2422
child 64	ecb300a325e8