git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@54 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 142 insertions, 142 deletions

diff --git a/src/apps/mplayerc/PPageDVD.cpp b/src/apps/mplayerc/PPageDVD.cpp
index e0813b539..b15493599 100644
--- a/src/apps/mplayerc/PPageDVD.cpp
+++ b/src/apps/mplayerc/PPageDVD.cpp
@@ -29,150 +29,150 @@
 struct

 {

 	LCID lcid;

-	TCHAR name[64];

+	LPCSTR name;

 } 

 LCIDNameList[] =

 {

-	{0x0000, _T("Default")},

-	{0x0436, _T("Afrikaans")},

-	{0x041c, _T("Albanian")},

-	{0x0401, _T("Arabic (Saudi Arabia)")},

-	{0x0801, _T("Arabic (Iraq)")},

-	{0x0c01, _T("Arabic (Egypt)")},

-	{0x1001, _T("Arabic (Libya)")},

-	{0x1401, _T("Arabic (Algeria)")},

-	{0x1801, _T("Arabic (Morocco)")},

-	{0x1c01, _T("Arabic (Tunisia)")},

-	{0x2001, _T("Arabic (Oman)")},

-	{0x2401, _T("Arabic (Yemen)")},

-	{0x2801, _T("Arabic (Syria)")},

-	{0x2c01, _T("Arabic (Jordan)")},

-	{0x3001, _T("Arabic (Lebanon)")},

-	{0x3401, _T("Arabic (Kuwait)")},

-	{0x3801, _T("Arabic (U.A.E.)")},

-	{0x3c01, _T("Arabic (Bahrain)")},

-	{0x4001, _T("Arabic (Qatar)")},

-	{0x042b, _T("Armenian")},

-	{0x042c, _T("Azeri (Latin)")},

-	{0x082c, _T("Azeri (Cyrillic)")},

-	{0x042d, _T("Basque")},

-	{0x0423, _T("Belarusian")},

-	{0x0402, _T("Bulgarian")},

-	{0x0455, _T("Burmese")},

-	{0x0403, _T("Catalan")},

-	{0x0404, _T("Chinese (Taiwan)")},

-	{0x0804, _T("Chinese (PRC)")},

-	{0x0c04, _T("Chinese (Hong Kong SAR, PRC)")},

-	{0x1004, _T("Chinese (Singapore)")},

-	{0x1404, _T("Chinese (Macau SAR)")},

-	{0x041a, _T("Croatian")},

-	{0x0405, _T("Czech")},

-	{0x0406, _T("Danish")},

-	{0x0465, _T("Divehi")},

-	{0x0413, _T("Dutch (Netherlands)")},

-	{0x0813, _T("Dutch (Belgium)")},

-	{0x0409, _T("English (United States)")},

-	{0x0809, _T("English (United Kingdom)")},

-	{0x0c09, _T("English (Australian)")},

-	{0x1009, _T("English (Canadian)")},

-	{0x1409, _T("English (New Zealand)")},

-	{0x1809, _T("English (Ireland)")},

-	{0x1c09, _T("English (South Africa)")},

-	{0x2009, _T("English (Jamaica)")},

-	{0x2409, _T("English (Caribbean)")},

-	{0x2809, _T("English (Belize)")},

-	{0x2c09, _T("English (Trinidad)")},

-	{0x3009, _T("English (Zimbabwe)")},

-	{0x3409, _T("English (Philippines)")},

-	{0x0425, _T("Estonian")},

-	{0x0438, _T("Faeroese")},

-	{0x0429, _T("Farsi")},

-	{0x040b, _T("Finnish")},

-	{0x040c, _T("French (Standard)")},

-	{0x080c, _T("French (Belgian)")},

-	{0x0c0c, _T("French (Canadian)")},

-	{0x100c, _T("French (Switzerland)")},

-	{0x140c, _T("French (Luxembourg)")},

-	{0x180c, _T("French (Monaco)")},

-	{0x0456, _T("Galician")},

-	{0x0437, _T("Georgian")},

-	{0x0407, _T("German (Standard)")},

-	{0x0807, _T("German (Switzerland)")},

-	{0x0c07, _T("German (Austria)")},

-	{0x1007, _T("German (Luxembourg)")},

-	{0x1407, _T("German (Liechtenstein)")},

-	{0x0408, _T("Greek")},

-	{0x0447, _T("Gujarati")},

-	{0x040d, _T("Hebrew")},

-	{0x0439, _T("Hindi")},

-	{0x040e, _T("Hungarian")},

-	{0x040f, _T("Icelandic")},

-	{0x0421, _T("Indonesian")},

-	{0x0410, _T("Italian (Standard)")},

-	{0x0810, _T("Italian (Switzerland)")},

-	{0x0411, _T("Japanese")},

-	{0x044b, _T("Kannada")},

-	{0x0457, _T("Konkani")},

-	{0x0412, _T("Korean")},

-	{0x0812, _T("Korean (Johab)")},

-	{0x0440, _T("Kyrgyz")},

-	{0x0426, _T("Latvian")},

-	{0x0427, _T("Lithuanian")},

-	{0x0827, _T("Lithuanian (Classic)")},

-	{0x042f, _T("FYRO Macedonian")},

-	{0x043e, _T("Malay (Malaysian)")},

-	{0x083e, _T("Malay (Brunei Darussalam)")},

-	{0x044e, _T("Marathi")},

-	{0x0450, _T("Mongolian")},

-	{0x0414, _T("Norwegian (Bokmal)")},

-	{0x0814, _T("Norwegian (Nynorsk)")},

-	{0x0415, _T("Polish")},

-	{0x0416, _T("Portuguese (Brazil)")},

-	{0x0816, _T("Portuguese (Portugal)")},

-	{0x0446, _T("Punjabi")},

-	{0x0418, _T("Romanian")},

-	{0x0419, _T("Russian")},

-	{0x044f, _T("Sanskrit")},

-	{0x0c1a, _T("Serbian (Cyrillic)")},

-	{0x081a, _T("Serbian (Latin)")},

-	{0x041b, _T("Slovak")},

-	{0x0424, _T("Slovenian")},

-	{0x040a, _T("Spanish (Spain, Traditional Sort)")},

-	{0x080a, _T("Spanish (Mexican)")},

-	{0x0c0a, _T("Spanish (Spain, International Sort)")},

-	{0x100a, _T("Spanish (Guatemala)")},

-	{0x140a, _T("Spanish (Costa Rica)")},

-	{0x180a, _T("Spanish (Panama)")},

-	{0x1c0a, _T("Spanish (Dominican Republic)")},

-	{0x200a, _T("Spanish (Venezuela)")},

-	{0x240a, _T("Spanish (Colombia)")},

-	{0x280a, _T("Spanish (Peru)")},

-	{0x2c0a, _T("Spanish (Argentina)")},

-	{0x300a, _T("Spanish (Ecuador)")},

-	{0x340a, _T("Spanish (Chile)")},

-	{0x380a, _T("Spanish (Uruguay)")},

-	{0x3c0a, _T("Spanish (Paraguay)")},

-	{0x400a, _T("Spanish (Bolivia)")},

-	{0x440a, _T("Spanish (El Salvador)")},

-	{0x480a, _T("Spanish (Honduras)")},

-	{0x4c0a, _T("Spanish (Nicaragua)")},

-	{0x500a, _T("Spanish (Puerto Rico)")},

-	{0x0430, _T("Sutu")},

-	{0x0441, _T("Swahili (Kenya)")},

-	{0x041d, _T("Swedish")},

-	{0x081d, _T("Swedish (Finland)")},

-	{0x045a, _T("Syriac")},

-	{0x0449, _T("Tamil")},

-	{0x0444, _T("Tatar (Tatarstan)")},

-	{0x044a, _T("Telugu")},

-	{0x041e, _T("Thai")},

-	{0x041f, _T("Turkish")},

-	{0x0422, _T("Ukrainian")},

-	{0x0420, _T("Urdu (Pakistan)")},

-	{0x0820, _T("Urdu (India)")},

-	{0x0443, _T("Uzbek (Latin)")},

-	{0x0843, _T("Uzbek (Cyrillic)")},

-	{0x042a, _T("Vietnamese")}

+	{0x0000, "Default"},

+	{0x0436, "Afrikaans"},

+	{0x041c, "Albanian"},

+	{0x0401, "Arabic (Saudi Arabia)"},

+	{0x0801, "Arabic (Iraq)"},

+	{0x0c01, "Arabic (Egypt)"},

+	{0x1001, "Arabic (Libya)"},

+	{0x1401, "Arabic (Algeria)"},

+	{0x1801, "Arabic (Morocco)"},

+	{0x1c01, "Arabic (Tunisia)"},

+	{0x2001, "Arabic (Oman)"},

+	{0x2401, "Arabic (Yemen)"},

+	{0x2801, "Arabic (Syria)"},

+	{0x2c01, "Arabic (Jordan)"},

+	{0x3001, "Arabic (Lebanon)"},

+	{0x3401, "Arabic (Kuwait)"},

+	{0x3801, "Arabic (U.A.E.)"},

+	{0x3c01, "Arabic (Bahrain)"},

+	{0x4001, "Arabic (Qatar)"},

+	{0x042b, "Armenian"},

+	{0x042c, "Azeri (Latin)"},

+	{0x082c, "Azeri (Cyrillic)"},

+	{0x042d, "Basque"},

+	{0x0423, "Belarusian"},

+	{0x0402, "Bulgarian"},

+	{0x0455, "Burmese"},

+	{0x0403, "Catalan"},

+	{0x0404, "Chinese (Taiwan)"},

+	{0x0804, "Chinese (PRC)"},

+	{0x0c04, "Chinese (Hong Kong SAR, PRC)"},

+	{0x1004, "Chinese (Singapore)"},

+	{0x1404, "Chinese (Macau SAR)"},

+	{0x041a, "Croatian"},

+	{0x0405, "Czech"},

+	{0x0406, "Danish"},

+	{0x0465, "Divehi"},

+	{0x0413, "Dutch (Netherlands)"},

+	{0x0813, "Dutch (Belgium)"},

+	{0x0409, "English (United States)"},

+	{0x0809, "English (United Kingdom)"},

+	{0x0c09, "English (Australian)"},

+	{0x1009, "English (Canadian)"},

+	{0x1409, "English (New Zealand)"},

+	{0x1809, "English (Ireland)"},

+	{0x1c09, "English (South Africa)"},

+	{0x2009, "English (Jamaica)"},

+	{0x2409, "English (Caribbean)"},

+	{0x2809, "English (Belize)"},

+	{0x2c09, "English (Trinidad)"},

+	{0x3009, "English (Zimbabwe)"},

+	{0x3409, "English (Philippines)"},

+	{0x0425, "Estonian"},

+	{0x0438, "Faeroese"},

+	{0x0429, "Farsi"},

+	{0x040b, "Finnish"},

+	{0x040c, "French (Standard)"},

+	{0x080c, "French (Belgian)"},

+	{0x0c0c, "French (Canadian)"},

+	{0x100c, "French (Switzerland)"},

+	{0x140c, "French (Luxembourg)"},

+	{0x180c, "French (Monaco)"},

+	{0x0456, "Galician"},

+	{0x0437, "Georgian"},

+	{0x0407, "German (Standard)"},

+	{0x0807, "German (Switzerland)"},

+	{0x0c07, "German (Austria)"},

+	{0x1007, "German (Luxembourg)"},

+	{0x1407, "German (Liechtenstein)"},

+	{0x0408, "Greek"},

+	{0x0447, "Gujarati"},

+	{0x040d, "Hebrew"},

+	{0x0439, "Hindi"},

+	{0x040e, "Hungarian"},

+	{0x040f, "Icelandic"},

+	{0x0421, "Indonesian"},

+	{0x0410, "Italian (Standard)"},

+	{0x0810, "Italian (Switzerland)"},

+	{0x0411, "Japanese"},

+	{0x044b, "Kannada"},

+	{0x0457, "Konkani"},

+	{0x0412, "Korean"},

+	{0x0812, "Korean (Johab)"},

+	{0x0440, "Kyrgyz"},

+	{0x0426, "Latvian"},

+	{0x0427, "Lithuanian"},

+	{0x0827, "Lithuanian (Classic)"},

+	{0x042f, "FYRO Macedonian"},

+	{0x043e, "Malay (Malaysian)"},

+	{0x083e, "Malay (Brunei Darussalam)"},

+	{0x044e, "Marathi"},

+	{0x0450, "Mongolian"},

+	{0x0414, "Norwegian (Bokmal)"},

+	{0x0814, "Norwegian (Nynorsk)"},

+	{0x0415, "Polish"},

+	{0x0416, "Portuguese (Brazil)"},

+	{0x0816, "Portuguese (Portugal)"},

+	{0x0446, "Punjabi"},

+	{0x0418, "Romanian"},

+	{0x0419, "Russian"},

+	{0x044f, "Sanskrit"},

+	{0x0c1a, "Serbian (Cyrillic)"},

+	{0x081a, "Serbian (Latin)"},

+	{0x041b, "Slovak"},

+	{0x0424, "Slovenian"},

+	{0x040a, "Spanish (Spain, Traditional Sort)"},

+	{0x080a, "Spanish (Mexican)"},

+	{0x0c0a, "Spanish (Spain, International Sort)"},

+	{0x100a, "Spanish (Guatemala)"},

+	{0x140a, "Spanish (Costa Rica)"},

+	{0x180a, "Spanish (Panama)"},

+	{0x1c0a, "Spanish (Dominican Republic)"},

+	{0x200a, "Spanish (Venezuela)"},

+	{0x240a, "Spanish (Colombia)"},

+	{0x280a, "Spanish (Peru)"},

+	{0x2c0a, "Spanish (Argentina)"},

+	{0x300a, "Spanish (Ecuador)"},

+	{0x340a, "Spanish (Chile)"},

+	{0x380a, "Spanish (Uruguay)"},

+	{0x3c0a, "Spanish (Paraguay)"},

+	{0x400a, "Spanish (Bolivia)"},

+	{0x440a, "Spanish (El Salvador)"},

+	{0x480a, "Spanish (Honduras)"},

+	{0x4c0a, "Spanish (Nicaragua)"},

+	{0x500a, "Spanish (Puerto Rico)"},

+	{0x0430, "Sutu"},

+	{0x0441, "Swahili (Kenya)"},

+	{0x041d, "Swedish"},

+	{0x081d, "Swedish (Finland)"},

+	{0x045a, "Syriac"},

+	{0x0449, "Tamil"},

+	{0x0444, "Tatar (Tatarstan)"},

+	{0x044a, "Telugu"},

+	{0x041e, "Thai"},

+	{0x041f, "Turkish"},

+	{0x0422, "Ukrainian"},

+	{0x0420, "Urdu (Pakistan)"},

+	{0x0820, "Urdu (India)"},

+	{0x0443, "Uzbek (Latin)"},

+	{0x0843, "Uzbek (Cyrillic)"},

+	{0x042a, "Vietnamese"}

 };

 

 

@@ -253,7 +253,7 @@ BOOL CPPageDVD::OnInitDialog()
 

 	for(int i = 0; i < countof(LCIDNameList); i++)

 	{

-		m_lcids.AddString(LCIDNameList[i].name);

+		m_lcids.AddString(CString(LCIDNameList[i].name));

 		m_lcids.SetItemData(i, LCIDNameList[i].lcid);

 	}