diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 029846208..25c690b05 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,26 @@ +2010-08-24 Ozkan Sezer + + * winnt.h: Fix several SUBLANG ID errors (ref: + http://msdn.microsoft.com/en-us/library/dd318693(VS.85).aspx). + (SUBLANG_UI_CUSTOM_DEFAULT): 0x05, not 0x03. + (SUBLANG_HAUSA_NIGERIA): Bad ID name, correct one is ... + (SUBLANG_HAUSA_NIGERIA_LATIN): ... this. + (SUBLANG_INUKTITUT_CANADA_LATIN): 0x02, not 0x01. + (SUBLANG_IRISH_IRELAND): 0x02, not 0x01. + (SUBLANG_LAO_LAO_PDR): Bad ID name, correct one is ... + (SUBLANG_LAO_LAO): ... this. + (SUBLANG_LOWER_SORBIAN_GERMANY): 0x02, not 0x01. + (SUBLANG_SAMI_SKOLT_FINLAND): 0x08, not 0x03. + (SUBLANG_SAMI_INARI_FINLAND): 0x09, not 0x03. + (SUBLANG_SYRIAC_SYRIA): define as SUBLANG_SYRIAC (what MSDN mentions). + (SUBLANG_TIGRIGNA_ERITREA): 0x02, not 0x01. + (SUBLANG_BENGALI_INDIA): 0x01, not 0x00. + (SUBLANG_BENGALI_BANGLADESH): 0x02, not 0x01. + (SUBLANG_PUNJABI_INDIA): 0x01, not 0x00. + (SUBLANG_PUNJABI_PAKISTAN): not defined in MSDN. + (SUBLANG_ROMANIAN_ROMANIA): 0x01, not 0x00. + (SUBLANG_ROMANIAN_MOLDOVA): not defined in MSDN. + 2010-08-24 LRN * include/mmreg.h (MPEGLAYER3WAVEFORMAT, WAVE_FORMAT_UNKNOWN, diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index f905981b5..e38c5ccad 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -670,7 +670,7 @@ typedef DWORD FLONG; #define SUBLANG_SYS_DEFAULT 0x02 #define SUBLANG_CUSTOM_DEFAULT 0x03 #define SUBLANG_CUSTOM_UNSPECIFIED 0x04 -#define SUBLANG_UI_CUSTOM_DEFAULT 0x03 +#define SUBLANG_UI_CUSTOM_DEFAULT 0x05 #define SUBLANG_AFRIKAANS_SOUTH_AFRICA 0x01 #define SUBLANG_ALBANIAN_ALBANIA 0x01 #define SUBLANG_ALSATIAN_FRANCE 0x01 @@ -698,8 +698,8 @@ typedef DWORD FLONG; #define SUBLANG_BASHKIR_RUSSIA 0x01 #define SUBLANG_BASQUE_BASQUE 0x01 #define SUBLANG_BELARUSIAN_BELARUS 0x01 -#define SUBLANG_BENGALI_INDIA 0x00 -#define SUBLANG_BENGALI_BANGLADESH 0x01 +#define SUBLANG_BENGALI_INDIA 0x01 +#define SUBLANG_BENGALI_BANGLADESH 0x02 #define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN 0x05 #define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x08 #define SUBLANG_BRETON_FRANCE 0x01 @@ -758,7 +758,8 @@ typedef DWORD FLONG; #define SUBLANG_GREEK_GREECE 0x01 #define SUBLANG_GREENLANDIC_GREENLAND 0x01 #define SUBLANG_GUJARATI_INDIA 0x01 -#define SUBLANG_HAUSA_NIGERIA 0x01 +#define SUBLANG_HAUSA_NIGERIA_LATIN 0x01 +#define SUBLANG_HAUSA_NIGERIA SUBLANG_HAUSA_NIGERIA_LATIN /* SUBLANG_HAUSA_NIGERIA_LATIN is what MS defines */ #define SUBLANG_HEBREW_ISRAEL 0x01 #define SUBLANG_HINDI_INDIA 0x01 #define SUBLANG_HUNGARIAN_HUNGARY 0x01 @@ -766,8 +767,8 @@ typedef DWORD FLONG; #define SUBLANG_IGBO_NIGERIA 0x01 #define SUBLANG_INDONESIAN_INDONESIA 0x01 #define SUBLANG_INUKTITUT_CANADA 0x01 -#define SUBLANG_INUKTITUT_CANADA_LATIN 0x01 -#define SUBLANG_IRISH_IRELAND 0x01 +#define SUBLANG_INUKTITUT_CANADA_LATIN 0x02 +#define SUBLANG_IRISH_IRELAND 0x02 #define SUBLANG_ITALIAN 0x01 #define SUBLANG_ITALIAN_SWISS 0x02 #define SUBLANG_JAPANESE_JAPAN 0x01 @@ -780,13 +781,14 @@ typedef DWORD FLONG; #define SUBLANG_KONKANI_INDIA 0x01 #define SUBLANG_KOREAN 0x01 #define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 -#define SUBLANG_LAO_LAO_PDR 0x01 +#define SUBLANG_LAO_LAO 0x01 +#define SUBLANG_LAO_LAO_PDR SUBLANG_LAO_LAO /* SUBLANG_LAO_LAO is what MS defines */ #define SUBLANG_LATVIAN_LATVIA 0x01 #if (WINVER >= 0x0600) #define SUBLANG_LITHUANIAN_LITHUANIA 0x01 #endif #define SUBLANG_LITHUANIAN 0x01 -#define SUBLANG_LOWER_SORBIAN_GERMANY 0x01 +#define SUBLANG_LOWER_SORBIAN_GERMANY 0x02 #define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01 #define SUBLANG_MACEDONIAN_MACEDONIA 0x01 #define SUBLANG_MALAY_MALAYSIA 0x01 @@ -813,13 +815,13 @@ typedef DWORD FLONG; #define SUBLANG_PORTUGUESE_PORTUGAL 0x02 #endif #define SUBLANG_PORTUGUESE 0x02 -#define SUBLANG_PUNJABI_INDIA 0x00 -#define SUBLANG_PUNJABI_PAKISTAN 0x01 +#define SUBLANG_PUNJABI_INDIA 0x01 +/* ??? #define SUBLANG_PUNJABI_PAKISTAN 0x01 ??? */ #define SUBLANG_QUECHUA_BOLIVIA 0x01 #define SUBLANG_QUECHUA_ECUADOR 0x02 #define SUBLANG_QUECHUA_PERU 0x03 -#define SUBLANG_ROMANIAN_ROMANIA 0x00 -#define SUBLANG_ROMANIAN_MOLDOVA 0x01 +#define SUBLANG_ROMANIAN_ROMANIA 0x01 +/* ??? #define SUBLANG_ROMANIAN_MOLDOVA 0x01 ??? */ #define SUBLANG_ROMANSH_SWITZERLAND 0x01 #define SUBLANG_RUSSIAN_RUSSIA 0x01 #define SUBLANG_SAMI_NORTHERN_NORWAY 0x01 @@ -829,8 +831,8 @@ typedef DWORD FLONG; #define SUBLANG_SAMI_LULE_SWEDEN 0x05 #define SUBLANG_SAMI_SOUTHERN_NORWAY 0x06 #define SUBLANG_SAMI_SOUTHERN_SWEDEN 0x07 -#define SUBLANG_SAMI_SKOLT_FINLAND 0x03 -#define SUBLANG_SAMI_INARI_FINLAND 0x03 +#define SUBLANG_SAMI_SKOLT_FINLAND 0x08 +#define SUBLANG_SAMI_INARI_FINLAND 0x09 #define SUBLANG_SANSKRIT_INDIA 0x01 #define SUBLANG_SERBIAN_LATIN 0x02 #define SUBLANG_SERBIAN_CYRILLIC 0x03 @@ -868,6 +870,7 @@ typedef DWORD FLONG; #define SUBLANG_SWEDISH 0x01 #define SUBLANG_SWEDISH_FINLAND 0x02 #define SUBLANG_SYRIAC 0x01 +#define SUBLANG_SYRIAC_SYRIA SUBLANG_SYRIAC /* SUBLANG_SYRIAC_SYRIA is what MSDN mentions */ #define SUBLANG_TAJIK_TAJIKISTAN 0x01 #define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 #define SUBLANG_TAMIL_INDIA 0x01 @@ -876,7 +879,7 @@ typedef DWORD FLONG; #define SUBLANG_THAI_THAILAND 0x01 #define SUBLANG_TIBETAN_PRC 0x01 #define SUBLANG_TIBETAN_BHUTAN 0x02 -#define SUBLANG_TIGRIGNA_ERITREA 0x01 +#define SUBLANG_TIGRIGNA_ERITREA 0x02 #define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 #define SUBLANG_TURKISH_TURKEY 0x01 #define SUBLANG_TURKMEN_TURKMENISTAN 0x01