* Char -> AnsiChar

rtl/wince/dos.pp

@@ -13,6 +13,9 @@
 
  **********************************************************************}
 unit dos;
+
+{$mode fpc}
+
 interface
 
 uses windows;
@@ -301,7 +304,7 @@ end;
                          --- Findfirst FindNext ---
 ******************************************************************************}
 
-Procedure StringToPchar (Var S : String);
+Procedure StringToPchar (Var S : ShortString);
 Var L : Longint;
 begin
   L:=ord(S[0]);
@@ -309,18 +312,18 @@ begin
   S[L]:=#0;
 end;
 
-Procedure PCharToString (Var S : String);
+Procedure PCharToString (Var S : ShortString);
 Var L : Longint;
 begin
-  L:=strlen(pchar(@S[0]));
+  L:=strlen(PAnsiChar(@S[0]));
   Move (S[0],S[1],L);
-  S[0]:=char(l);
+  S[0]:=AnsiChar(l);
 end;
 
 
 procedure FindMatch(var f:searchrec);
 var
-  buf: array[0..MaxPathLen] of char;
+  buf: array[0..MaxPathLen] of AnsiChar;
 begin
   { Find file with correct attribute }
   While (F.W32FindData.dwFileAttributes and cardinal(F.ExcludeAttr))<>0 do
@@ -404,7 +407,7 @@ end;
                                --- File ---
 ******************************************************************************}
 
-Function FSearch(path: pathstr; dirlist: string): pathstr;
+Function FSearch(path: pathstr; dirlist: shortstring): pathstr;
 var
   p1     : longint;
   s      : searchrec;

rtl/wince/sysdl.inc

@@ -29,7 +29,7 @@ end;
 Function SysGetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
-  Result:=WinGetProcAddress(Lib,PChar(ProcName));
+  Result:=WinGetProcAddress(Lib,PAnsiChar(ProcName));
 end;
 
 {$push}
@@ -37,7 +37,7 @@ end;
 Function SysGetProcedureAddressOrdinal(Lib : TLibHandle; Ordinal : TOrdinalEntry) : Pointer;
 
 begin
-  Result:=WinGetProcAddress(Lib,PChar(Ordinal));
+  Result:=WinGetProcAddress(Lib,PAnsiChar(Ordinal));
 end;
 {$pop}
 
@@ -47,7 +47,7 @@ begin
   Result:=WinFreeLibrary(Lib);
 end;
 
-Function SysGetLoadErrorStr: string;
+Function SysGetLoadErrorStr: AnsiString;
 
 Var
   rc,c : integer;

rtl/wince/system.pp

@@ -41,8 +41,8 @@ const
  DriveSeparator = ':';
  ExtensionSeparator = '.';
  PathSeparator = ';';
- AllowDirectorySeparators : set of char = ['\','/'];
- AllowDriveSeparators : set of char = [':'];
+ AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+ AllowDriveSeparators : set of AnsiChar = [':'];
 { FileNameCaseSensitive and FileNameCasePreserving are defined separately below!!! }
  maxExitCode = 65535;
  MaxPathLen = 260;
@@ -77,13 +77,13 @@ const
   Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;
 
 { ANSI <-> Wide }
-function AnsiToWideBuf(AnsiBuf: PChar; AnsiBufLen: longint; WideBuf: PWideChar; WideBufLen: longint): longint;
-function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PChar; AnsiBufLen: longint): longint;
-function PCharToPWideChar(str: PChar; strlen: longint = -1; outlen: PLongInt = nil): PWideChar;
+function AnsiToWideBuf(AnsiBuf: PAnsiChar; AnsiBufLen: longint; WideBuf: PWideChar; WideBufLen: longint): longint;
+function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PAnsiChar; AnsiBufLen: longint): longint;
+function PCharToPWideChar(str: PAnsiChar; strlen: longint = -1; outlen: PLongInt = nil): PWideChar;
 function StringToPWideChar(const s: AnsiString; outlen: PLongInt = nil): PWideChar;
 
 { Wrappers for some WinAPI calls }
-function  CreateEvent(lpEventAttributes:pointer;bManualReset:longbool;bInitialState:longbool;lpName:pchar): THandle;
+function  CreateEvent(lpEventAttributes:pointer;bManualReset:longbool;bInitialState:longbool;lpName:PAnsiChar): THandle;
 function ResetEvent(h: THandle): LONGBOOL;
 function SetEvent(h: THandle): LONGBOOL;
 function GetCurrentProcessId:DWORD;
@@ -197,10 +197,10 @@ function muls(s1,s2 : single) : single; compilerproc;
 function divs(s1,s2 : single) : single; compilerproc;
 {$endif CPUARM}
 
-function CmdLine: PChar;
+function CmdLine: PAnsiChar;
 { C compatible arguments }
 function argc: longint;
-function argv: ppchar;
+function argv: PPAnsiChar;
 
 implementation
 
@@ -315,14 +315,14 @@ const
      MB_ERR_INVALID_CHARS = 8;
      MB_USEGLYPHCHARS = 4;
 
-function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint;
+function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PAnsiChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint;
      cdecl; external 'coredll' name 'MultiByteToWideChar';
-function WideCharToMultiByte(CodePage:UINT; dwFlags:DWORD; lpWideCharStr:PWideChar; cchWideChar:longint; lpMultiByteStr:PChar;cchMultiByte:longint; lpDefaultChar:PChar; lpUsedDefaultChar:pointer):longint;
+function WideCharToMultiByte(CodePage:UINT; dwFlags:DWORD; lpWideCharStr:PWideChar; cchWideChar:longint; lpMultiByteStr:PAnsiChar;cchMultiByte:longint; lpDefaultChar:PAnsiChar; lpUsedDefaultChar:pointer):longint;
      cdecl; external 'coredll' name 'WideCharToMultiByte';
 function GetACP:UINT; cdecl; external 'coredll' name 'GetACP';
 
 { Returns number of characters stored to WideBuf, including null-terminator. }
-function AnsiToWideBuf(AnsiBuf: PChar; AnsiBufLen: longint; WideBuf: PWideChar; WideBufLen: longint): longint;
+function AnsiToWideBuf(AnsiBuf: PAnsiChar; AnsiBufLen: longint; WideBuf: PWideChar; WideBufLen: longint): longint;
 begin
   Result := MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, AnsiBuf, AnsiBufLen, WideBuf, WideBufLen div SizeOf(WideChar));
   if ((AnsiBufLen <> -1) or (Result = 0)) and (WideBuf <> nil) then
@@ -340,7 +340,7 @@ begin
 end;
 
 { Returns number of characters stored to AnsiBuf, including null-terminator. }
-function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PChar; AnsiBufLen: longint): longint;
+function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PAnsiChar; AnsiBufLen: longint): longint;
 begin
   Result := WideCharToMultiByte(CP_ACP, 0, WideBuf, WideCharsLen, AnsiBuf, AnsiBufLen, nil, nil);
   if ((WideCharsLen <> -1) or (Result = 0)) and (AnsiBuf <> nil) then
@@ -359,7 +359,7 @@ end;
 
 { Returns dynamic memory block, which contains wide string. This memory should be freed using FreeMem. }
 { outlen will contain number of wide characters stored to result buffer, including null-terminator. }
-function PCharToPWideChar(str: PChar; strlen: longint = -1; outlen: PLongInt = nil): PWideChar;
+function PCharToPWideChar(str: PAnsiChar; strlen: longint = -1; outlen: PLongInt = nil): PWideChar;
 var
   len: longint;
 begin
@@ -400,14 +400,14 @@ begin
   len:=Length(s);
   wlen:=(len + 1)*SizeOf(WideChar);
   GetMem(Result, wlen);
-  wlen:=AnsiToWideBuf(PChar(s), len, Result, wlen)*SizeOf(WideChar);
+  wlen:=AnsiToWideBuf(PAnsiChar(s), len, Result, wlen)*SizeOf(WideChar);
   if wlen = 0 then
   begin
-    wlen:=AnsiToWideBuf(PChar(s), len, nil, 0)*SizeOf(WideChar);
+    wlen:=AnsiToWideBuf(PAnsiChar(s), len, nil, 0)*SizeOf(WideChar);
     if wlen > 0 then
     begin
       ReAllocMem(Result, wlen);
-      wlen:=AnsiToWideBuf(PChar(s), len, Result, wlen)*SizeOf(WideChar);
+      wlen:=AnsiToWideBuf(PAnsiChar(s), len, Result, wlen)*SizeOf(WideChar);
     end
     else
     begin
@@ -445,7 +445,7 @@ const
 function CreateEventW(lpEventAttributes:pointer;bManualReset:longbool;bInitialState:longbool;lpName:PWideChar): THandle;
     cdecl; external KernelDLL name 'CreateEventW';
 
-function CreateEvent(lpEventAttributes:pointer;bManualReset:longbool;bInitialState:longbool;lpName:pchar): THandle;
+function CreateEvent(lpEventAttributes:pointer;bManualReset:longbool;bInitialState:longbool;lpName:PAnsiChar): THandle;
 var
   buf: array[0..MaxPathLen] of WideChar;
 begin
@@ -510,9 +510,9 @@ function GetCommandLine : pwidechar;
     cdecl; external KernelDLL name 'GetCommandLineW';
 
 var
-  ModuleName : array[0..255] of char;
+  ModuleName : array[0..255] of AnsiChar;
 
-function GetCommandFile:pchar;
+function GetCommandFile:PAnsiChar;
 var
   buf: array[0..MaxPathLen] of WideChar;
 begin
@@ -525,16 +525,16 @@ end;
 
 var
   Fargc: longint;
-  Fargv: ppchar;
-  FCmdLine: PChar;
+  Fargv: PPAnsiChar;
+  FCmdLine: PAnsiChar;
 
 procedure setup_arguments;
 var
   arglen,
   count   : longint;
   argstart,
-  pc,arg  : pchar;
-  quote   : char;
+  pc,arg  : PAnsiChar;
+  quote   : AnsiChar;
   argvlen : longint;
 
   procedure allocarg(idx,len:longint);
@@ -566,7 +566,7 @@ begin
   allocarg(0,arglen);
   move(pc^,Fargv[0]^,arglen+1);
   { Setup FCmdLine variable }
-  arg:=PChar(GetCommandLine);
+  arg:=PAnsiChar(GetCommandLine);
   count:=WideToAnsiBuf(PWideChar(arg), -1, nil, 0);
   FCmdLine:=SysGetMem(arglen + count + 3);
   FCmdLine^:='"';
@@ -605,7 +605,7 @@ begin
             begin
               if quote<>'''' then
                begin
-                 if pchar(pc+1)^<>'"' then
+                 if PAnsiChar(pc+1)^<>'"' then
                   begin
                     if quote='"' then
                      quote:=' '
@@ -622,7 +622,7 @@ begin
             begin
               if quote<>'"' then
                begin
-                 if pchar(pc+1)^<>'''' then
+                 if PAnsiChar(pc+1)^<>'''' then
                   begin
                     if quote=''''  then
                      quote:=' '
@@ -665,7 +665,7 @@ begin
                begin
                  if quote<>'''' then
                   begin
-                    if pchar(pc+1)^<>'"' then
+                    if PAnsiChar(pc+1)^<>'"' then
                      begin
                        if quote='"' then
                         quote:=' '
@@ -685,7 +685,7 @@ begin
                begin
                  if quote<>'"' then
                   begin
-                    if pchar(pc+1)^<>'''' then
+                    if PAnsiChar(pc+1)^<>'''' then
                      begin
                        if quote=''''  then
                         quote:=' '
@@ -723,7 +723,7 @@ begin
   sysreallocmem(Fargv,(argc+1)*sizeof(pointer));
 end;
 
-function CmdLine: PChar;
+function CmdLine: PAnsiChar;
 begin
   setup_arguments;
   Result:=FCmdLine;
@@ -735,7 +735,7 @@ begin
   Result:=Fargc;
 end;
 
-function argv: ppchar;
+function argv: PPAnsiChar;
 begin
   setup_arguments;
   Result:=Fargv;
@@ -1440,7 +1440,7 @@ procedure WinCEWide2AnsiMove(source:pwidechar;var dest:RawByteString;cp:TSystemC
       end;
   end;
 
-procedure WinCEAnsi2WideMove(source:pchar;cp:TSystemCodePage;var dest:widestring;len:SizeInt);
+procedure WinCEAnsi2WideMove(source:PAnsiChar;cp:TSystemCodePage;var dest:widestring;len:SizeInt);
   var
     destlen: SizeInt;
     dwFlags: DWORD;
@@ -1489,7 +1489,7 @@ procedure WinCEUnicode2AnsiMove(source:punicodechar;var dest:RawByteString;cp:TS
       end;
   end;
 
-procedure WinCEAnsi2UnicodeMove(source:pchar;cp : TSystemCodePage;var dest:UnicodeString;len:SizeInt);
+procedure WinCEAnsi2UnicodeMove(source:PAnsiChar;cp : TSystemCodePage;var dest:UnicodeString;len:SizeInt);
   var
     destlen: SizeInt;
     dwflags: DWORD;
@@ -1629,7 +1629,7 @@ end;
 const
   ErrorBufferLength = 1024;
 var
-  ErrorBuf : array[0..ErrorBufferLength] of char;
+  ErrorBuf : array[0..ErrorBufferLength] of AnsiChar;
   ErrorBufW : array[0..ErrorBufferLength] of widechar;
   ErrorLen : longint;
 

rtl/wince/sysutils.pp

@@ -520,10 +520,10 @@ begin
 end;
 
 
-function GetLocaleChar(LID, LT: Longint; Def: Char): Char;
+function GetLocaleChar(LID, LT: Longint; Def: AnsiChar): AnsiChar;
 var
   Buf: array[0..1] of WideChar;
-  Buf2: array[0..1] of Char;
+  Buf2: array[0..1] of AnsiChar;
 begin
   if GetLocaleInfo(LID, LT, Buf, 2) > 0 then
   begin
@@ -916,7 +916,7 @@ begin
   FreeMem(ws1);
 end;
 
-function WinCEAnsiStrComp(S1, S2: PChar): PtrInt;
+function WinCEAnsiStrComp(S1, S2: PAnsiChar): PtrInt;
 var
   ws1, ws2: PWideChar;
 begin
@@ -928,7 +928,7 @@ begin
 end;
 
 
-function WinCEAnsiStrIComp(S1, S2: PChar): PtrInt;
+function WinCEAnsiStrIComp(S1, S2: PAnsiChar): PtrInt;
 var
   ws1, ws2: PWideChar;
 begin
@@ -940,7 +940,7 @@ begin
 end;
 
 
-function WinCEAnsiStrLComp(S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function WinCEAnsiStrLComp(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   ws1, ws2: PWideChar;
   len1, len2: longint;
@@ -953,7 +953,7 @@ begin
 end;
 
 
-function WinCEAnsiStrLIComp(S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function WinCEAnsiStrLIComp(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   ws1, ws2: PWideChar;
   len1, len2: longint;
@@ -966,7 +966,7 @@ begin
 end;
 
 
-function WinCEAnsiStrLower(Str: PChar): PChar;
+function WinCEAnsiStrLower(Str: PAnsiChar): PAnsiChar;
 var
   buf: PWideChar;
   len: longint;
@@ -979,7 +979,7 @@ begin
 end;
 
 
-function WinCEAnsiStrUpper(Str: PChar): PChar;
+function WinCEAnsiStrUpper(Str: PAnsiChar): PAnsiChar;
 var
   buf: PWideChar;
   len: longint;

rtl/wince/wininc/base.inc

@@ -66,7 +66,7 @@
      CALTYPE = cardinal;
      CALID = cardinal;
 
-     CCHAR = char;                    //winnt
+     CCHAR = AnsiChar;                    //winnt
 
      COLORREF = Cardinal;             //windef
      TCOLORREF = cardinal;
@@ -160,16 +160,16 @@
      LP     = ^word;
      LPBOOL = ^WINBOOL;      //windef
      LPBYTE = System.pbyte;         //windef
-     LPCCH  = PCHAR;         //winnt
-     LPCH   = PCHAR;         //winnt
+     LPCCH  = PAnsiChar;         //winnt
+     LPCH   = PAnsiChar;         //winnt
 
      LPCOLORREF = ^COLORREF; //windef
 
-     LPCSTR  = Pchar;        //winnt
+     LPCSTR  = PAnsiChar;        //winnt
 {$ifdef UNICODE}
      LPCTSTR = Pwidechar;    //winnt
 {$else}
-     LPCTSTR = Pchar;        //winnt
+     LPCTSTR = PAnsiChar;        //winnt
 {$endif}
 
      LPCWCH  = Pwidechar;   //winnt
@@ -181,13 +181,13 @@
      LPINT  = ^longint;     //windef
      LPLONG = ^longint;     //windef
 
-     LPSTR = Pchar;         //winnt
+     LPSTR = PAnsiChar;         //winnt
 {$ifdef UNICODE}
      LPTCH  = Pwidechar;
      LPTSTR = Pwidechar;
 {$else}
-     LPTCH  = Pchar;
-     LPTSTR = Pchar;
+     LPTCH  = PAnsiChar;
+     LPTSTR = PAnsiChar;
 {$endif}
 
      LRESULT = longint;     //windef LONG_PTR
@@ -218,10 +218,10 @@
 
      PBYTE = ^BYTE;         //windef
 
-     PCCH = PCHAR;          //winnt
-     PCH  = PCHAR;          //winnt
+     PCCH = PAnsiChar;          //winnt
+     PCH  = PAnsiChar;          //winnt
 
-     PCSTR = Pchar;
+     PCSTR = PAnsiChar;
 
      PCWCH  = Pwidechar;    //winnt
      PCWSTR = Pwidechar;    //winnt
@@ -236,9 +236,9 @@
      PSHORT = ^SHORT;       //windef
      LPSHORT = ^SHORT;      //+windef
 
-     PSTR = Pchar;
+     PSTR = PAnsiChar;
 
-     PSZ = Pchar;         //winnt
+     PSZ = PAnsiChar;         //winnt
 {$ifdef UNICODE}
      PTBYTE = ^word;      //winnt
      PTCH = Pwidechar;
@@ -246,9 +246,9 @@
      PTSTR = Pwidechar;
 {$else}
      PTBYTE = ^byte;
-     PTCH   = Pchar;
-     PTCHAR = Pchar;
-     PTSTR  = Pchar;
+     PTCH   = PAnsiChar;
+     PTCHAR = PAnsiChar;
+     PTSTR  = PAnsiChar;
 {$endif}
 
      PUCHAR = ^byte;        //windef
@@ -277,7 +277,7 @@
      BCHAR = word;
 {$else}
      TBYTE = byte;
-     TCHAR = char;
+     TCHAR = AnsiChar;
      BCHAR = BYTE;
 {$endif}
 
@@ -696,7 +696,7 @@ type
 
      ICMENUMPROC = function (_para1:LPTSTR; _para2:LPARAM):longint;
 
-     EDITWORDBREAKPROCEX = function (_para1:pchar; _para2:LONG; _para3:BYTE; _para4:WINT):LONG;
+     EDITWORDBREAKPROCEX = function (_para1:PAnsiChar; _para2:LONG; _para3:BYTE; _para4:WINT):LONG;
 
      PFNLVCOMPARE = function (_para1:LPARAM; _para2:LPARAM; _para3:LPARAM):longint;
 

rtl/wince/wininc/cemiss.inc

@@ -205,7 +205,7 @@ var
 begin
  lpwsValueName:=PCharToPWideChar(lpValueName);
  if dwType in [REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ] then begin
-   if (cbData > 0) and (PChar(lpData)[cbData - 1] = #0) then
+   if (cbData > 0) and (PAnsiChar(lpData)[cbData - 1] = #0) then
      Dec(cbData);
    ws:=PCharToPWideChar(lpData, cbData, @sz);
    cbData:=sz*SizeOf(WideChar);

rtl/wince/wininc/coredll.inc

@@ -2327,7 +2327,7 @@ function Header_InsertItem(hwndHD:HWND;index : longint;var hdi : HD_ITEM) : long
 function Header_Layout(hwndHD:HWND;var layout : HD_LAYOUT) : WINBOOL;
 function Header_SetItem(hwndHD:HWND;index : longint;var hdi : HD_ITEM) : WINBOOL;
 function HeapAlloc(hHeap:HANDLE; dwFlags:DWORD; dwBytes:DWORD):LPVOID; external KernelDLL name 'HeapAlloc';
-function HeapAllocTrace(hHeap:HANDLE; dwFlags:DWORD; dwBytes:DWORD; dwLineNum:DWORD; szFileName:PCHAR):LPVOID; external KernelDLL name 'HeapAllocTrace';  //+winbase
+function HeapAllocTrace(hHeap:HANDLE; dwFlags:DWORD; dwBytes:DWORD; dwLineNum:DWORD; szFileName:PAnsiChar):LPVOID; external KernelDLL name 'HeapAllocTrace';  //+winbase
 function HeapCreate(flOptions:DWORD; dwInitialSize:DWORD; dwMaximumSize:DWORD):HANDLE; external KernelDLL name 'HeapCreate';
 function HeapDestroy(hHeap:HANDLE):WINBOOL; external KernelDLL name 'HeapDestroy';
 function HeapFree(hHeap:HANDLE; dwFlags:DWORD; lpMem:LPVOID):WINBOOL; external KernelDLL name 'HeapFree';
@@ -2808,7 +2808,7 @@ function TranslateAccelerator(hWnd:HWND; hAccTable:HACCEL; lpMsg:LPMSG):longint;
 function TranslateAcceleratorW(hWnd:HWND; hAccTable:HACCEL; lpMsg:LPMSG):longint; external KernelDLL name 'TranslateAcceleratorW';
 function TranslateCharsetInfo(var lpSrc:DWORD; lpCs:LPCHARSETINFO; dwFlags:DWORD):WINBOOL; external KernelDLL name 'TranslateCharsetInfo';
 function TranslateMessage(lpMsg:LPMSG):WINBOOL; external KernelDLL name 'TranslateMessage';
-function TransmitCommChar(hFile:HANDLE; cChar:char):WINBOOL; external KernelDLL name 'TransmitCommChar';
+function TransmitCommChar(hFile:HANDLE; cChar:AnsiChar):WINBOOL; external KernelDLL name 'TransmitCommChar';
 function TransparentBlt(hdcDest : HDC;DstX : LONG;DstY : LONG;DstCx : LONG;DstCy : LONG;hSrc : HANDLE;SrcX : LONG;SrcY : LONG;SrcCx : LONG;SrcCy : LONG;TransparentColor : COLORREF): WINBOOL; external KernelDLL name 'TransparentImage';
 function TransparentImage(hdcDest : HDC;DstX : LONG;DstY : LONG;DstCx : LONG;DstCy : LONG;hSrc : HANDLE;SrcX : LONG;SrcY : LONG;SrcCx : LONG;SrcCy : LONG;TransparentColor : COLORREF): WINBOOL; external KernelDLL name 'TransparentImage';
 function TreeView_InsertItem(hwnd:HWND;lpis : LPTV_INSERTSTRUCT) : LRESULT;
@@ -2912,7 +2912,7 @@ function wcsstr(_string:PWideChar; strCharSet:PWideChar):PWideChar; external Ker
 function wcstod(nptr:PWideChar; var endptr:PWideChar):double; external KernelDLL name 'wcstod'; // index 5B5
 function wcstok(strToken:PWideChar; strDelimit:PWideChar):PWideChar; external KernelDLL name 'wcstok'; // index 67
 function wcstol(nptr:PWideChar; var endptr:PWideChar; _base:longint):longint; external KernelDLL name 'wcstol'; // index 5B6
-function wcstombs(mbstr:PChar; wcstr:PWideChar; _count:SIZE_T):SIZE_T; external KernelDLL name 'wcstombs'; // index 65
+function wcstombs(mbstr:PAnsiChar; wcstr:PWideChar; _count:SIZE_T):SIZE_T; external KernelDLL name 'wcstombs'; // index 65
 function wcstoul(nptr:PWideChar; var endptr:PWideChar; _base:longint):Cardinal; external KernelDLL name 'wcstoul'; // index 5B7
 function wsprintf(lpBuffer:LPWSTR; lpFormat:LPCWSTR; const args:array of const):longint; external KernelDLL name 'wsprintfW';
 function wsprintfW(lpBuffer:LPWSTR; lpFormat:LPCWSTR; const args:array of const):longint; external KernelDLL name 'wsprintfW';
@@ -3036,7 +3036,7 @@ end;
 
 procedure FillMemory(Destination:PVOID; Length:DWORD; Fill:BYTE);
 begin
-  FillChar(Destination^,Length,Char(Fill));
+  FillChar(Destination^,Length,AnsiChar(Fill));
 end;
 
 function GetCurrentThread:HANDLE;

rtl/wince/wininc/messages.inc

@@ -1278,7 +1278,7 @@ Type
     TWMGetText = record
       Msg : Cardinal;
       TextMax : LongInt;
-      Text : PChar;
+      Text : PAnsiChar;
       Result : LongInt;
     end;
 

rtl/wince/wininc/struct.inc

@@ -62,7 +62,7 @@
       va_list is just a dummy record
       MvdV: Nevertheless it should be a pointer type, not a record}
 
-     va_list = pchar;
+     va_list = PAnsiChar;
 
      ABC = record
           abcA : longint;
@@ -602,7 +602,7 @@
               case longint of
                  0 : ( UnicodeChar : WCHAR;
                        Attributes  : Word);
-                 1 : ( AsciiChar : CHAR );
+                 1 : ( AsciiChar : AnsiChar );
               end;
      _CHAR_INFO = CHAR_INFO;
      TCHAR_INFO = CHAR_INFO;
@@ -860,11 +860,11 @@
           ByteSize : BYTE;
           Parity : BYTE;
           StopBits : BYTE;
-          XonChar : char;
-          XoffChar : char;
-          ErrorChar : char;
-          EofChar : char;
-          EvtChar : char;
+          XonChar : AnsiChar;
+          XoffChar : AnsiChar;
+          ErrorChar : AnsiChar;
+          EofChar : AnsiChar;
+          EvtChar : AnsiChar;
           wReserved1 : WORD;
        end;
      LPDCB = ^DCB;
@@ -2329,7 +2329,7 @@
      // routine when a floating point exception is detected
      _EXCEPTION = record  //+stdlib
        type_  : Integer;  //identifier type replaced by Type_ for compilation
-       Name   : PChar;    // name of function where error occurred
+       Name   : PAnsiChar;    // name of function where error occurred
        arg1   : double;   // first argument to function
        arg2   : double;   // second argument (if any) to function
        retval : double;   // value to be returned by function
@@ -2478,7 +2478,7 @@
           dbcp_size : ULONG;
           dbcp_devicetype : ULONG;
           dbcp_reserved : ULONG;
-          dbcp_name : array[0..0] of char;
+          dbcp_name : array[0..0] of AnsiChar;
        end;
      PDEV_BROADCAST_PORT = ^DEV_BROADCAST_PORT;
      _DEV_BROADCAST_PORT = DEV_BROADCAST_PORT;
@@ -2487,7 +2487,7 @@
 
      _DEV_BROADCAST_USERDEFINED = record
           dbud_dbh : _DEV_BROADCAST_HDR;
-          dbud_szName : array[0..0] of char;
+          dbud_szName : array[0..0] of AnsiChar;
           dbud_rgbUserDefined : array[0..0] of BYTE;
        end;
      TDEVBROADCASTUSERDEFINED = _DEV_BROADCAST_USERDEFINED;
@@ -3936,7 +3936,7 @@
     SID   UserSid
     TCHAR Strings[]
     BYTE  Data[]
-    CHAR  Pad[]
+    AnsiChar  Pad[]
     DWORD Length;
    }
 
@@ -4350,7 +4350,7 @@
           case longint of
              0 : ( UnicodeChar : WCHAR;
                    dwControlKeyState : DWORD; );
-             1 : ( AsciiChar : CHAR );
+             1 : ( AsciiChar : AnsiChar );
        end;
      _KEY_EVENT_RECORD = KEY_EVENT_RECORD;
      TKEYEVENTRECORD = KEY_EVENT_RECORD;
@@ -5382,7 +5382,7 @@
           nErrCode : WORD;
           Reserved1 : WORD;
           Reserved2 : WORD;
-          szPathName : array[0..(OFS_MAXPATHNAME)-1] of CHAR;
+          szPathName : array[0..(OFS_MAXPATHNAME)-1] of AnsiChar;
        end;
      LPOFSTRUCT = ^OFSTRUCT;
      _OFSTRUCT = OFSTRUCT;
@@ -6184,8 +6184,8 @@
           dwSize : DWORD;
           hrasconn : HRASCONN;
           szEntryName : array[0..(RAS_MaxEntryName + 1)-1] of TCHAR;
-          szDeviceType : array[0..(RAS_MaxDeviceType + 1)-1] of CHAR;
-          szDeviceName : array[0..(RAS_MaxDeviceName + 1)-1] of CHAR;
+          szDeviceType : array[0..(RAS_MaxDeviceType + 1)-1] of AnsiChar;
+          szDeviceName : array[0..(RAS_MaxDeviceName + 1)-1] of AnsiChar;
        end;
      _RASCONN = RASCONN;
      TRASCONN = RASCONN;
@@ -6336,7 +6336,7 @@
 
      RGNDATA = record
           rdh : RGNDATAHEADER;
-          Buffer : array[0..0] of char;
+          Buffer : array[0..0] of AnsiChar;
        end;
      LPRGNDATA = ^RGNDATA;
      _RGNDATA = RGNDATA;
@@ -6593,7 +6593,7 @@
               case longint of
                  0 : ( pOleStr : LPWSTR );
                  1 : ( uOffset : UINT );
-                 2 : ( cStr : array[0..(MAX_PATH)-1] of char );
+                 2 : ( cStr : array[0..(MAX_PATH)-1] of AnsiChar );
               end;
        end;
      LPSTRRET = ^STRRET;
@@ -6603,7 +6603,7 @@
 
      STYLEBUF = record
           dwStyle : DWORD;
-          szDescription : array[0..31] of CHAR;
+          szDescription : array[0..31] of AnsiChar;
        end;
      LPSTYLEBUF = ^STYLEBUF;
      _tagSTYLEBUF = STYLEBUF;
@@ -6868,7 +6868,7 @@
      PTOGGLEKEYS = ^TOGGLEKEYS;
 
      TOKEN_SOURCE = record
-          SourceName : array[0..7] of CHAR;
+          SourceName : array[0..7] of AnsiChar;
           SourceIdentifier : LUID;
        end;
      _TOKEN_SOURCE = TOKEN_SOURCE;
@@ -7134,8 +7134,8 @@
        nFileSizeLow:DWORD;
        dwReserved0:DWORD;
        dwReserved1:DWORD;
-       cFileName:array[0..MAX_PATH-1] of char;
-       cAlternateFileName:array[0..13] of char;
+       cFileName:array[0..MAX_PATH-1] of AnsiChar;
+       cAlternateFileName:array[0..13] of AnsiChar;
      end;
      WIN32_FIND_DATAA = _WIN32_FIND_DATAA;
      PWIN32_FIND_DATAA = ^_WIN32_FIND_DATAA;
@@ -7583,7 +7583,7 @@
           uFlags: UINT;
           uCallbackMessage: UINT;
           hIcon: HICON;
-          szTip: array [0..63] of Char;
+          szTip: array [0..63] of AnsiChar;
      end;
      _NOTIFYICONDATA = _NOTIFYICONDATAA;
 

rtl/wince/winres.inc

@@ -16,17 +16,17 @@ begin
   IntEnumResourceTypes:=False;
 end;
 
-Function IntEnumResourceNames(ModuleHandle : TFPResourceHMODULE; ResourceType : PChar; EnumFunc : EnumResNameProc; lParam : PtrInt) : LongBool;
+Function IntEnumResourceNames(ModuleHandle : TFPResourceHMODULE; ResourceType : PAnsiChar; EnumFunc : EnumResNameProc; lParam : PtrInt) : LongBool;
 begin
   IntEnumResourceNames:=False;
 end;
 
-Function IntEnumResourceLanguages(ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PChar; EnumFunc : EnumResLangProc; lParam : PtrInt) : LongBool;
+Function IntEnumResourceLanguages(ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PAnsiChar; EnumFunc : EnumResLangProc; lParam : PtrInt) : LongBool;
 begin
   IntEnumResourceLanguages:=False;
 end;
 
-Function IntFindResource(ModuleHandle: TFPResourceHMODULE; ResourceName, ResourceType: PChar): TFPResourceHandle;
+Function IntFindResource(ModuleHandle: TFPResourceHMODULE; ResourceName, ResourceType: PAnsiChar): TFPResourceHandle;
 var
   ws1, ws2: PWideChar;
 begin
@@ -45,7 +45,7 @@ begin
     FreeMem(ws1);
 end;
 
-Function IntFindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType, ResourceName: PChar; Language : word): TFPResourceHandle;
+Function IntFindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType, ResourceName: PAnsiChar; Language : word): TFPResourceHandle;
 begin
   IntFindResourceEx:=FindResource(ModuleHandle,ResourceName,ResourceType);
 end;