Morphunits: locale unit, fixed calling convention, missing functions

git-svn-id: trunk@34574 -

packages/morphunits/src/locale.pas

@@ -263,22 +263,22 @@ function ParseDate(Locale: PLocale location 'a0'; Date: PDateStamp location 'a1'
 function StrConvert(Locale: PLocale location 'a0'; String1: STRPTR location 'a1'; Buffer: APTR location 'a2'; BufferSize: LongWord location 'd0'; Typ: LongWord location 'd1'): LongWord; syscall LocaleBase 29;
 function StrnCmp(Locale: PLocale location 'a0'; String1: STRPTR location 'a2'; String2: STRPTR location 'a2'; Length: LongInt location 'd0'; Typ: LongWord location 'd1'): LongInt; syscall LocaleBase 30;
 // MorphOS specific
-function UCS4_ConvToLower(UCharacter: WideChar): WideChar; syscall sysvbase LocaleBase 232;
-function UCS4_ConvToUpper(UCharacter: WideChar): WideChar; syscall sysvbase LocaleBase 238;
-function UTF8_Decode(UTF8: STRPTR; UCharacter: PWideChar): LongWord; syscall sysvbase LocaleBase 244;
-function UTF8_Encode(UCharacter: WideChar; UTF8: STRPTR): LongWord; syscall sysvbase LocaleBase 250;
+function UCS4_ConvToLower(UCharacter: WideChar): WideChar; syscall sysv LocaleBase 232;
+function UCS4_ConvToUpper(UCharacter: WideChar): WideChar; syscall sysv LocaleBase 238;
+function UTF8_Decode(UTF8: STRPTR; UCharacter: PWideChar): LongWord; syscall sysv LocaleBase 244;
+function UTF8_Encode(UCharacter: WideChar; UTF8: STRPTR): LongWord; syscall sysv LocaleBase 250;
 function UCS4_GetCatalogStr(Catalog: PCatalog; StringNum: LongWord; defaultString: WSTRPTR): WSTRPTR; syscall sysvbase LocaleBase 256;
-function UCS4_IsAlNum(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 262;
-function UCS4_IsAlpha(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 268;
-function UCS4_IsCntrl(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 274;
-function UCS4_IsDigit(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 280;
-function UCS4_IsGraph(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 286;
-function UCS4_IsLower(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 292;
-function UCS4_IsPrint(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 298;
-function UCS4_IsPunct(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 304;
-function UCS4_IsSpace(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 310;
-function UCS4_IsUpper(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 316;
-function UCS4_IsXDigit(Locale: PLocale; Character: WideChar): LongBool; syscall sysvbase LocaleBase 322;
+function UCS4_IsAlNum(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 262;
+function UCS4_IsAlpha(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 268;
+function UCS4_IsCntrl(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 274;
+function UCS4_IsDigit(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 280;
+function UCS4_IsGraph(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 286;
+function UCS4_IsLower(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 292;
+function UCS4_IsPrint(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 298;
+function UCS4_IsPunct(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 304;
+function UCS4_IsSpace(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 310;
+function UCS4_IsUpper(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 316;
+function UCS4_IsXDigit(Locale: PLocale; Character: WideChar): LongBool; syscall sysv LocaleBase 322;
 procedure UCS4_FormatDate(Locale: PLocale; FmtTemplate: WSTRPTR; Date: PDateStamp; PutCharFunc: PHook); syscall sysvbase LocaleBase 328;
 function UCS4_FormatString(Locale: PLocale; FmtTemplate: WSTRPTR; DataStream: APTR; PutCharFunc: PHook): APTR; syscall sysvbase LocaleBase 334;
 function UCS4_GetLocaleStr(Locale: PLocale; StringNum: LongWord): WSTRPTR; syscall sysvbase LocaleBase 340;
@@ -286,17 +286,20 @@ function UCS4_StrnCmp(Locale: PLocale; String1: WSTRPTR; String2: WSTRPTR; Lengt
 function UCS4_StrToLower(Locale: PLocale; String1: WSTRPTR; buffer: WSTRPTR; BufferSize: LongWord; Typ: LongWord): LongInt; syscall sysvbase LocaleBase 352;
 function UCS4_StrToUpper(Locale: PLocale; String1: WSTRPTR; buffer: WSTRPTR; BufferSize: LongWord; Typ: LongWord): LongInt; syscall sysvbase LocaleBase 358;
 function UCS4_Decompose(Ch: WideChar): WSTRPTR; syscall sysvbase LocaleBase 364;
-function UCS4_IsNSM(UCharacter: WideChar): LongBool; syscall sysvbase LocaleBase 370;
+function UCS4_IsNSM(UCharacter: WideChar): LongBool; syscall sysv LocaleBase 370;
 function UCS4_CanonicalDecompose(Ch: WideChar): WSTRPTR; syscall sysvbase LocaleBase 376;
 procedure UCS4_Normalize(Src: WSTRPTR; Dst: WSTRPTR; Length: LongInt; Typ: LongWord); syscall sysvbase LocaleBase 382;
-function ConvertUTF8ToUCS4(Src: STRPTR; Dst: WSTRPTR; Length: LongInt): LongWord; syscall sysvbase LocaleBase 388;
-function ConvertUCS4ToUTF8(Src: WSTRPTR; Dst: STRPTR; Length: LongInt): LongWord; syscall sysvbase LocaleBase 394;
-function UCS4_IsCombining(UCharacter: WideChar): LongWord; syscall sysvbase LocaleBase 400;
+function ConvertUTF8ToUCS4(Src: STRPTR; Dst: WSTRPTR; Length: LongInt): LongWord; syscall sysv LocaleBase 388;
+function ConvertUCS4ToUTF8(Src: WSTRPTR; Dst: STRPTR; Length: LongInt): LongWord; syscall sysv LocaleBase 394;
+function UCS4_IsCombining(UCharacter: WideChar): LongWord; syscall sysv LocaleBase 400;
 function UCS4_Compare(Locale: PLocale; String1: WSTRPTR; String2: WSTRPTR; Length: LongInt; Flags: LongWord): LongInt; syscall sysvbase LocaleBase 406;
-function UCS4_GetCombiningClass(UCharacter: WideChar): LongWord; syscall sysvbase LocaleBase 412;
+function UCS4_GetCombiningClass(UCharacter: WideChar): LongWord; syscall sysv LocaleBase 412;
 function UCS4_NormalizedLength(String1: WSTRPTR; Lenght: LongInt; Typ: LongWord): LongWord; syscall sysvbase LocaleBase 418;
 function UTF8_CheckEncoding(String1: STRPTR; Length: LongInt): LongInt; syscall sysvbase LocaleBase 424;
 function IsUnicode(Buffer: APTR; Length: LongWord): LongWord; syscall sysvbase LocaleBase 430;
+function UTF8_EncodingLength(Utf32: WideChar): LongWord; syscall sysv LocaleBase 436;
+function UTF8_DecodeSafe(Src: STRPTR; Dest: PWideChar; Length: LongWord): LongWord; syscall sysvbase LocaleBase 442;
+procedure FormatClockData(Locale: PLocale; FormatString: STRPTR; CData: PClockData; Hook: PHook); syscall sysvbase LocaleBase 448;
 procedure UCS4_FormatClockData(Locale: PLocale; FormatString: WSTRPTR; CData: PClockData; Hook: PHook); syscall sysvbase LocaleBase 460;
 
 function OpenCatalog(Locale: PLocale; Name: STRPTR; const Tags: array of PtrUInt): PCatalog;