Sfoglia il codice sorgente

* PChar -> PAnsiChar

Michaël Van Canneyt 2 anni fa
parent
commit
e53f842d50

+ 35 - 35
packages/winunits-base/src/activex.pp

@@ -427,8 +427,8 @@ Const
      VT_UNKNOWN          [V][T]   [S]  IUnknown *
      VT_DECIMAL          [V][T]   [S]  16 byte fixed point
      VT_RECORD           [V]   [P][S]  user defined type
-     VT_I1               [V][T][P][s]  signed char
-     VT_UI1              [V][T][P][S]  unsigned char
+     VT_I1               [V][T][P][s]  signed AnsiChar
+     VT_UI1              [V][T][P][S]  unsigned AnsiChar
      VT_UI2              [V][T][P][S]  unsigned short
      VT_UI4              [V][T][P][S]  unsigned long
      VT_I8                  [T][P]     signed 64-bit int
@@ -1725,7 +1725,7 @@ TYPE
        VT_UI2:                  (uiVal: Word);
        VT_UI4:                  (ulVal: LongWord);
        VT_UI8:                  (ullVal: QWord);
-       VT_I1:                   (cVal: Char);  { shortint,perhaps? But it is Char both in PSDK and Delphi }
+       VT_I1:                   (cVal: AnsiChar);  { shortint,perhaps? But it is AnsiChar both in PSDK and Delphi }
        VT_I2:                   (iVal: Smallint);
        VT_I4:                   (lVal: Longint);
        VT_I8:                   (llVal: Int64);
@@ -1744,7 +1744,7 @@ TYPE
        VT_BYREF or VT_UI2:      (puiVal: PWord);
        VT_BYREF or VT_UI4:      (pulVal: PInteger);
        VT_BYREF or VT_UI8:      (pullVal: PQWord);
-       VT_BYREF or VT_I1:       (pcVal: PChar); { PShortInt?? }
+       VT_BYREF or VT_I1:       (pcVal: PAnsiChar); { PShortInt?? }
        VT_BYREF or VT_I2:       (piVal: PSmallint);
        VT_BYREF or VT_I4:       (plVal: PLongint);
        VT_BYREF or VT_I8:       (pllVal: PInt64);
@@ -2106,7 +2106,7 @@ TYPE
 
    tagCAC = record
         cElems : ULONG;
-        pElems : pCHAR;
+        pElems : PAnsiChar;
      end;
    CAC = tagCAC;
    TCAC = tagCAC;
@@ -2266,7 +2266,7 @@ TYPE
           wReserved2 : PROPVAR_PAD2;
           wReserved3 : PROPVAR_PAD3;
           case longint of
-                 0 : ( cVal : CHAR );
+                 0 : ( cVal : AnsiChar );
                  1 : ( bVal : UCHAR );
                  2 : ( iVal : SHORT );
                  3 : ( uiVal : USHORT );
@@ -2319,7 +2319,7 @@ TYPE
                  50 : ( calpstr : CALPSTR );
                  51 : ( calpwstr : CALPWSTR );
                  52 : ( capropvar : CAPROPVARIANT );
-                 53 : ( pcVal : pCHAR );
+                 53 : ( pcVal : PAnsiChar );
                  54 : ( pbVal : pUCHAR );
                  55 : ( piVal : pSHORT );
                  56 : ( puiVal : pUSHORT );
@@ -4672,7 +4672,7 @@ function VarUI1FromDate(dateIn:DATE; var pbOut:BYTE):HResult;stdcall;external ol
 function VarUI1FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromStr';
 function VarUI1FromDisp(pdispIn:IDispatch; lcid:LCID; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromDisp';
 function VarUI1FromBool(boolIn:VARIANT_BOOL; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromBool';
-function VarUI1FromI1(cIn:CHAR; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromI1';
+function VarUI1FromI1(cIn:AnsiChar; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromI1';
 function VarUI1FromUI2(uiIn:USHORT; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromUI2';
 function VarUI1FromUI4(ulIn:ULONG; var pbOut:BYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromUI4';
 function VarUI1FromUI8(ui64In:ULONG64; pbOut:PBYTE):HResult;stdcall;external oleaut32dll name 'VarUI1FromUI8';
@@ -4688,7 +4688,7 @@ function VarI2FromDate(dateIn:DATE; var psOut:SHORT):HResult;stdcall;external ol
 function VarI2FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromStr';
 function VarI2FromDisp(pdispIn:IDispatch; lcid:LCID; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromDisp';
 function VarI2FromBool(boolIn:VARIANT_BOOL; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromBool';
-function VarI2FromI1(cIn:CHAR; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromI1';
+function VarI2FromI1(cIn:AnsiChar; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromI1';
 function VarI2FromUI2(uiIn:USHORT; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromUI2';
 function VarI2FromUI4(ulIn:ULONG; var psOut:SHORT):HResult;stdcall;external oleaut32dll name 'VarI2FromUI4';
 
@@ -4705,7 +4705,7 @@ function VarI4FromDate(dateIn:DATE; var plOut:LONG):HResult;stdcall;external ole
 function VarI4FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromStr';
 function VarI4FromDisp(dispIn:IDispatch; lcid:LCID; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromDisp';
 function VarI4FromBool(boolIn:VARIANT_BOOL; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromBool';
-function VarI4FromI1(cIn:CHAR; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromI1';
+function VarI4FromI1(cIn:AnsiChar; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromI1';
 function VarI4FromUI2(uiIn:USHORT; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromUI2';
 function VarI4FromUI4(ulIn:ULONG; var plOut:LONG):HResult;stdcall;external oleaut32dll name 'VarI4FromUI4';
 
@@ -4723,7 +4723,7 @@ function VarI8FromDate(dateIn:DATE; pi64Out:PLONG64):HResult;stdcall;external ol
 function VarI8FromStr(strIn:POLECHAR; lcid:LCID; dwFlags:dword; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromStr';
 function VarI8FromDisp(pdispIn:IDispatch; lcid:LCID; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromDisp';
 function VarI8FromBool(boolIn:VARIANT_BOOL; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromBool';
-function VarI8FromI1(cIn:CHAR; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromI1';
+function VarI8FromI1(cIn:AnsiChar; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromI1';
 
 function VarI8FromUI2(uiIn:USHORT; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromUI2';
 function VarI8FromUI4(ulIn:ULONG; pi64Out:PLONG64):HResult;stdcall;external oleaut32dll name 'VarI8FromUI4';
@@ -4743,7 +4743,7 @@ function VarR4FromDate(dateIn:DATE; var pfltOut:Single):HResult;stdcall;external
 function VarR4FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromStr';
 function VarR4FromDisp(pdispIn:IDispatch; lcid:LCID; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromDisp';
 function VarR4FromBool(boolIn:VARIANT_BOOL; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromBool';
-function VarR4FromI1(cIn:CHAR; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromI1';
+function VarR4FromI1(cIn:AnsiChar; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromI1';
 function VarR4FromUI2(uiIn:USHORT; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromUI2';
 function VarR4FromUI4(ulIn:ULONG; var pfltOut:Single):HResult;stdcall;external oleaut32dll name 'VarR4FromUI4';
 
@@ -4760,7 +4760,7 @@ function VarR8FromDate(dateIn:DATE; var pdblOut:DOUBLE):HResult;stdcall;external
 function VarR8FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromStr';
 function VarR8FromDisp(pdispIn:IDispatch; lcid:LCID; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromDisp';
 function VarR8FromBool(boolIn:VARIANT_BOOL; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromBool';
-function VarR8FromI1(cIn:CHAR; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromI1';
+function VarR8FromI1(cIn:AnsiChar; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromI1';
 function VarR8FromUI2(uiIn:USHORT; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromUI2';
 function VarR8FromUI4(ulIn:ULONG; var pdblOut:DOUBLE):HResult;stdcall;external oleaut32dll name 'VarR8FromUI4';
 
@@ -4778,7 +4778,7 @@ function VarDateFromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pdateOut:D
 
 function VarDateFromDisp(pdispIn:IDispatch; lcid:LCID; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromDisp';
 function VarDateFromBool(boolIn:VARIANT_BOOL; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromBool';
-function VarDateFromI1(cIn:CHAR; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromI1';
+function VarDateFromI1(cIn:AnsiChar; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromI1';
 function VarDateFromUI2(uiIn:USHORT; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromUI2';
 function VarDateFromUI4(ulIn:ULONG; var pdateOut:DATE):HResult;stdcall;external oleaut32dll name 'VarDateFromUI4';
 
@@ -4795,7 +4795,7 @@ function VarCyFromDate(dateIn:DATE; var pcyOut:CY):HResult;stdcall;external olea
 function VarCyFromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromStr';
 function VarCyFromDisp(pdispIn:IDispatch; lcid:LCID; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromDisp';
 function VarCyFromBool(boolIn:VARIANT_BOOL; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromBool';
-function VarCyFromI1(cIn:CHAR; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromI1';
+function VarCyFromI1(cIn:AnsiChar; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromI1';
 function VarCyFromUI2(uiIn:USHORT; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromUI2';
 function VarCyFromUI4(ulIn:ULONG; var pcyOut:CY):HResult;stdcall;external oleaut32dll name 'VarCyFromUI4';
 
@@ -4812,7 +4812,7 @@ function VarBstrFromCy(cyIn:CY; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HRe
 function VarBstrFromDate(dateIn:DATE; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromDate';
 function VarBstrFromDisp(pdispIn:IDispatch; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromDisp';
 function VarBstrFromBool(boolIn:VARIANT_BOOL; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromBool';
-function VarBstrFromI1(cIn:CHAR; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromI1';
+function VarBstrFromI1(cIn:AnsiChar; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromI1';
 function VarBstrFromUI2(uiIn:USHORT; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromUI2';
 function VarBstrFromUI4(ulIn:ULONG; lcid:LCID; dwFlags:ULONG; var pbstrOut:BSTR):HResult;stdcall;external oleaut32dll name 'VarBstrFromUI4';
 
@@ -4829,27 +4829,27 @@ function VarBoolFromDate(dateIn:DATE; var pboolOut:VARIANT_BOOL):HResult;stdcall
 function VarBoolFromCy(cyIn:CY; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromCy';
 function VarBoolFromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromStr';
 function VarBoolFromDisp(pdispIn:IDispatch; lcid:LCID; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromDisp';
-function VarBoolFromI1(cIn:CHAR; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromI1';
+function VarBoolFromI1(cIn:AnsiChar; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromI1';
 function VarBoolFromUI2(uiIn:USHORT; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromUI2';
 function VarBoolFromUI4(ulIn:ULONG; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromUI4';
 
 function VarBoolFromUI8(i64In:ULONG64; pboolOut:PVARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromUI8';
 function VarBoolFromDec(var pdecIn:TDecimal; var pboolOut:VARIANT_BOOL):HResult;stdcall;external oleaut32dll name 'VarBoolFromDec';
-function VarI1FromUI1(bIn:BYTE; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromUI1';
-function VarI1FromI2(uiIn:SHORT; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromI2';
-function VarI1FromI4(lIn:LONG; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromI4';
-function VarI1FromI8(i64In:LONG64; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromI8';
-function VarI1FromR4(fltIn:Single; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromR4';
-function VarI1FromR8(dblIn:DOUBLE; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromR8';
-function VarI1FromDate(dateIn:DATE; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromDate';
-function VarI1FromCy(cyIn:CY; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromCy';
-function VarI1FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromStr';
-function VarI1FromDisp(pdispIn:IDispatch; lcid:LCID; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromDisp';
-function VarI1FromBool(boolIn:VARIANT_BOOL; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromBool';
-function VarI1FromUI2(uiIn:USHORT; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromUI2';
-function VarI1FromUI4(ulIn:ULONG; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromUI4';
-function VarI1FromUI8(i64In:ULONG64; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromUI8';
-function VarI1FromDec(var pdecIn:TDecimal; pcOut:pCHAR):HResult;stdcall;external oleaut32dll name 'VarI1FromDec';
+function VarI1FromUI1(bIn:BYTE; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromUI1';
+function VarI1FromI2(uiIn:SHORT; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromI2';
+function VarI1FromI4(lIn:LONG; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromI4';
+function VarI1FromI8(i64In:LONG64; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromI8';
+function VarI1FromR4(fltIn:Single; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromR4';
+function VarI1FromR8(dblIn:DOUBLE; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromR8';
+function VarI1FromDate(dateIn:DATE; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromDate';
+function VarI1FromCy(cyIn:CY; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromCy';
+function VarI1FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromStr';
+function VarI1FromDisp(pdispIn:IDispatch; lcid:LCID; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromDisp';
+function VarI1FromBool(boolIn:VARIANT_BOOL; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromBool';
+function VarI1FromUI2(uiIn:USHORT; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromUI2';
+function VarI1FromUI4(ulIn:ULONG; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromUI4';
+function VarI1FromUI8(i64In:ULONG64; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromUI8';
+function VarI1FromDec(var pdecIn:TDecimal; pcOut:PAnsiChar):HResult;stdcall;external oleaut32dll name 'VarI1FromDec';
 function VarUI2FromUI1(bIn:BYTE; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromUI1';
 function VarUI2FromI2(uiIn:SHORT; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromI2';
 function VarUI2FromI4(lIn:LONG; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromI4';
@@ -4862,7 +4862,7 @@ function VarUI2FromCy(cyIn:CY; var puiOut:USHORT):HResult;stdcall;external oleau
 function VarUI2FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromStr';
 function VarUI2FromDisp(pdispIn:IDispatch; lcid:LCID; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromDisp';
 function VarUI2FromBool(boolIn:VARIANT_BOOL; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromBool';
-function VarUI2FromI1(cIn:CHAR; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromI1';
+function VarUI2FromI1(cIn:AnsiChar; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromI1';
 function VarUI2FromUI4(ulIn:ULONG; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromUI4';
 function VarUI2FromUI8(i64In:ULONG64; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromUI8';
 function VarUI2FromDec(var pdecIn:TDecimal; var puiOut:USHORT):HResult;stdcall;external oleaut32dll name 'VarUI2FromDec';
@@ -4877,7 +4877,7 @@ function VarUI4FromCy(cyIn:CY; var pulOut:ULONG):HResult;stdcall;external oleaut
 function VarUI4FromStr(strIn:pOLECHAR; lcid:LCID; dwFlags:ULONG; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromStr';
 function VarUI4FromDisp(pdispIn:IDispatch; lcid:LCID; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromDisp';
 function VarUI4FromBool(boolIn:VARIANT_BOOL; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromBool';
-function VarUI4FromI1(cIn:CHAR; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromI1';
+function VarUI4FromI1(cIn:AnsiChar; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromI1';
 function VarUI4FromUI2(uiIn:USHORT; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromUI2';
 function VarUI4FromUI8(ui64In:ULONG64; var plOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromUI8';
 function VarUI4FromDec(var pdecIn:TDecimal; var pulOut:ULONG):HResult;stdcall;external oleaut32dll name 'VarUI4FromDec';
@@ -4894,7 +4894,7 @@ function VarUI8FromDate(dateIn:DATE; pi64Out:PULONG64):HResult;stdcall;external
 function VarUI8FromStr(strIn:POLECHAR; lcid:LCID; dwFlags:dword; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromStr';
 function VarUI8FromDisp(pdispIn:IDispatch; lcid:LCID; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromDisp';
 function VarUI8FromBool(boolIn:VARIANT_BOOL; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromBool';
-function VarUI8FromI1(cIn:CHAR; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromI1';
+function VarUI8FromI1(cIn:AnsiChar; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromI1';
 function VarUI8FromUI2(uiIn:USHORT; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromUI2';
 function VarUI8FromUI4(ulIn:ULONG; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromUI4';
 function VarUI8FromDec(var pdecIn:TDecimal; pi64Out:PULONG64):HResult;stdcall;external oleaut32dll name 'VarUI8FromDec';

+ 5 - 5
packages/winunits-base/src/commctrl.pp

@@ -2989,7 +2989,7 @@ CONST
 {$ifdef ie5plus}
          TTM_GETBUBBLESIZE              = (WM_USER + 30);
          TTM_ADJUSTRECT                 = (WM_USER + 31);
-         TTM_SETTITLEA                  = (WM_USER + 32);     // wParam = TTI_*, lParam = char* szTitle
+         TTM_SETTITLEA                  = (WM_USER + 32);     // wParam = TTI_*, lParam = AnsiChar* szTitle
          TTM_SETTITLEW                  = (WM_USER + 33);     // wParam = TTI_*, lParam = wchar* szTitle
 {$ENDIF}
 
@@ -3124,7 +3124,7 @@ TYPE
          tagNMTTDISPINFOA     = Record
                                  hdr          : NMHDR;
                                  lpszText     : LPSTR;
-                                 szText       : Array[0..79] of char;
+                                 szText       : Array[0..79] of AnsiChar;
                                  hinst        : HINST;
                                  uFlags       : UINT;
 {$ifdef ie3plus}
@@ -7269,7 +7269,7 @@ TYPE
          DummyStruct13        = Record
                                  hdr          : NMHDR;
                                  iItemid      : cint;
-                                 szText       : Array[0..CBEMAXSTRLEN-1] OF char;
+                                 szText       : Array[0..CBEMAXSTRLEN-1] OF AnsiChar;
                                  END;
          NMCBEDRAGBEGINA      = DummyStruct13;
          LPNMCBEDRAGBEGINA    = ^DummyStruct13;
@@ -7311,7 +7311,7 @@ TYPE
                                  hdr          : NMHDR;
                                  fChanged     : BOOL;
                                  iNewSelection : cint;
-                                 szText       : Array[0..CBEMAXSTRLEN-1] OF char;
+                                 szText       : Array[0..CBEMAXSTRLEN-1] OF AnsiChar;
                                  iWhy         : cint;
                                  END;
          NMCBEENDEDITA        = DummyStruct15;
@@ -8769,7 +8769,7 @@ TYPE
                                  pszFormat    : LPCSTR;          // format substring
                                  st           : SYSTEMTIME;      // current systemtime
                                  pszDisplay   : LPCSTR;          // string to display
-                                 szDisplay    : Array [0..63] OF CHAR;          // buffer pszDisplay originally points at
+                                 szDisplay    : Array [0..63] OF AnsiChar;          // buffer pszDisplay originally points at
                                  END;
          NMDATETIMEFORMATA    = tagNMDATETIMEFORMATA;
          LPNMDATETIMEFORMATA  = ^tagNMDATETIMEFORMATA;

+ 2 - 2
packages/winunits-base/src/comobj.pp

@@ -1423,13 +1423,13 @@ HKCR
       end;
 
 
-    procedure SearchIDs(const DispatchInterface : IDispatch; Names: PChar;
+    procedure SearchIDs(const DispatchInterface : IDispatch; Names: PAnsiChar;
       Count: Integer; IDs: PDispIDList);
       var
       	res : HRESULT;
       	NamesArray : ^PWideChar;
       	NamesData : PWideChar;
-      	OrigNames : PChar;
+      	OrigNames : PAnsiChar;
         NameCount,
       	NameLen,
       	NewNameLen,

+ 2 - 2
packages/winunits-base/src/comserv.pp

@@ -443,8 +443,8 @@ begin
   Result := True;
   if (ComServer <> nil) and (ComServer.ServerObjects > 0) and ComServer.IsInteractive then
   begin
-    Result := MessageBox(0, PChar('COM server is in use'),
-      PChar('OLE Automation'), MB_YESNO or MB_TASKMODAL or
+    Result := MessageBoxA(0, PAnsiChar('COM server is in use'),
+      PAnsiChar('OLE Automation'), MB_YESNO or MB_TASKMODAL or
       MB_ICONWARNING or MB_DEFBUTTON2) = IDYES;
   end;
 end;

+ 1 - 1
packages/winunits-base/src/htmlhelp.pp

@@ -261,7 +261,7 @@ Type
           clrForeground : COLORREF;       { use -1 for default }
           clrBackground : COLORREF;       { use -1 for default }
           rcMargins : RECT;               { amount of space between edges of window and text, -1 for each member to ignore }
-          pszFont : LPCTSTR;              { facename, point size, char set, BOLD ITALIC UNDERLINE }
+          pszFont : LPCTSTR;              { facename, point size, AnsiChar set, BOLD ITALIC UNDERLINE }
        end;
      HH_POPUP = tagHH_POPUP;
      PHH_POPUP = ^HH_POPUP;

+ 12 - 12
packages/winunits-base/src/httpapi.pp

@@ -252,7 +252,7 @@ interface
 
     _HTTP_SERVICE_BINDING_A = record
         Base : HTTP_SERVICE_BINDING_BASE;
-        Buffer : PCHAR;
+        Buffer : PAnsiChar;
         BufferSize : ULONG;
       end;
     HTTP_SERVICE_BINDING_A = _HTTP_SERVICE_BINDING_A;
@@ -606,16 +606,16 @@ type
       ReferrerLength : USHORT;
       UserName : PWCHAR;
       UriStem : PWCHAR;
-      ClientIp : PCHAR;
-      ServerName : PCHAR;
-      ServiceName : PCHAR;
-      ServerIp : PCHAR;
-      Method : PCHAR;
-      UriQuery : PCHAR;
-      Host : PCHAR;
-      UserAgent : PCHAR;
-      Cookie : PCHAR;
-      Referrer : PCHAR;
+      ClientIp : PAnsiChar;
+      ServerName : PAnsiChar;
+      ServiceName : PAnsiChar;
+      ServerIp : PAnsiChar;
+      Method : PAnsiChar;
+      UriQuery : PAnsiChar;
+      Host : PAnsiChar;
+      UserAgent : PAnsiChar;
+      Cookie : PAnsiChar;
+      Referrer : PAnsiChar;
       ServerPort : USHORT;
       ProtocolStatus : USHORT;
       Win32Status : ULONG;
@@ -809,7 +809,7 @@ type
       PackedContextType : ULONG;
       PackedContext : PVOID;
       MutualAuthDataLength : ULONG;
-      pMutualAuthData : PCHAR;
+      pMutualAuthData : PAnsiChar;
       PackageNameLength : USHORT;
       pPackageName : PWSTR;
     end;

+ 7 - 7
packages/winunits-base/src/imagehlp.pp

@@ -676,7 +676,7 @@ Type
           SizeOfStruct : dword;
           Key : pointer;
           LineNumber : dword;
-          FileName : pchar;
+          FileName : PAnsiChar;
           Address : dword64;
        end;
    IMAGEHLP_LINE64 = TIMAGEHLP_LINE64;
@@ -693,7 +693,7 @@ Type
           SizeOfStruct : dword;
           Key : pointer;
           LineNumber : dword;
-          FileName : pchar;
+          FileName : PAnsiChar;
           Address : dword;
        end;
      IMAGEHLP_LINE   = TIMAGEHLP_LINE;
@@ -703,7 +703,7 @@ Type
   PSOURCEFILE = ^TSOURCEFILE;
   TSOURCEFILE = record
           ModBase : dword64;
-          FileName : pchar;
+          FileName : PAnsiChar;
        end;  
   
   PIMAGEHLP_CBA_READ_MEMORY = ^TIMAGEHLP_CBA_READ_MEMORY;
@@ -720,7 +720,7 @@ Type
   TIMAGEHLP_CBA_EVENT = record
           severity : dword;
           code : dword;
-          desc : pchar;
+          desc : PAnsiChar;
           _object : pointer;
        end;
   IMAGEHLP_CBA_EVENT = TIMAGEHLP_CBA_EVENT;
@@ -801,7 +801,7 @@ Type
   TIMAGEHLP_SYMBOL_SRC = record
           sizeofstruct : dword;
           _type : dword;
-          _file : array[0..(MAX_PATH)-1] of char;
+          _file : array[0..(MAX_PATH)-1] of AnsiChar;
        end;
   IMAGEHLP_SYMBOL_SRC = TIMAGEHLP_SYMBOL_SRC;
   LPIMAGEHLP_SYMBOL_SRC = PIMAGEHLP_SYMBOL_SRC;
@@ -1444,8 +1444,8 @@ function ImagehlpApiVersion:LPAPI_VERSION;stdcall;external External_library name
 function ImagehlpApiVersionEx(AppVersion:LPAPI_VERSION):LPAPI_VERSION;stdcall;external External_library name 'ImagehlpApiVersionEx';
 function GetTimestampForLoadedLibrary(Module:HMODULE):dword;stdcall;external External_library name 'GetTimestampForLoadedLibrary';
 function SymSetParentWindow(hwnd:HWND):bool;stdcall;external External_library name 'SymSetParentWindow';
-function SymSetHomeDirectory(dir:LPCSTR):pchar;stdcall;external External_library name 'SymSetHomeDirectory';
-function SymGetHomeDirectory(_type:dword; dir:PSTR; size:Tsize):pchar;stdcall;external External_library name 'SymGetHomeDirectory';
+function SymSetHomeDirectory(dir:LPCSTR):PAnsiChar;stdcall;external External_library name 'SymSetHomeDirectory';
+function SymGetHomeDirectory(_type:dword; dir:PSTR; size:Tsize):PAnsiChar;stdcall;external External_library name 'SymGetHomeDirectory';
 function SymSetOptions(SymOptions:dword):dword;stdcall;external External_library name 'SymSetOptions';
 function SymGetOptions:dword;stdcall;external External_library name 'SymGetOptions';
 function SymCleanup(hProcess:THANDLE):BOOL;stdcall;external External_library name 'SymCleanup';

+ 34 - 34
packages/winunits-base/src/mmsystem.pp

@@ -178,7 +178,7 @@ Function sndPlaySoundA(Name: LPCSTR; flags: UINT): BOOL; stdcall; external 'winm
 
 Function sndPlaySoundW(Name: LPCWSTR; flags: UINT): BOOL;stdcall; external 'winmm.dll' name 'sndPlaySoundW';
 
-Function sndPlaySound(Name: PChar; flags: UINT): BOOL;stdcall; external 'winmm.dll' name
+Function sndPlaySound(Name: PAnsiChar; flags: UINT): BOOL;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'sndPlaySoundW' {$else}'sndPlaySoundA'{$endif};
 
 Const
@@ -1000,7 +1000,7 @@ Type
  TMMTime  = _mmtime;
 
  _wavehdr = packed Record
-                            lpData: PChar;
+                            lpData: PAnsiChar;
                             dwBufferLength: DWORD;
                             dwBytesRecorded: DWORD;
                             dwUser: DWORD_PTR;
@@ -1018,7 +1018,7 @@ Type
                           wMid: WORD;
                           wPid: WORD;
                           vDriverVersion: MMVERSION;
-                          szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                          szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                           dwFormats: DWORD;
                           wChannels: WORD;
                           wReserved1: WORD;
@@ -1063,7 +1063,7 @@ Type
                          wMid: WORD;
                          wPid: WORD;
                          vDriverVersion: MMVERSION;
-                         szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                         szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                          dwFormats: DWORD;
                          wChannels: WORD;
                          wReserved1: WORD;
@@ -1166,7 +1166,7 @@ Type
                            wMid: WORD;
                            wPid: WORD;
                            vDriverVersion: MMVERSION;
-                           szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                           szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                            wTechnology: WORD;
                            wVoices: WORD;
                            wNotes: WORD;
@@ -1198,7 +1198,7 @@ Type
                         wMid: WORD;
                         wPid: WORD;
                         vDriverVersion: MMVERSION;
-                        szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                        szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                         dwSupport: DWORD;
  		End;
  MIDIINCAPSA = _MIDIINCAPSA;
@@ -1244,7 +1244,7 @@ Type
 
  PMIDIHDR = ^_midihdr;
  _midihdr = packed Record
-                    lpData: PChar;
+                    lpData: PAnsiChar;
                     dwBufferLength: DWORD;
                     dwBytesRecorded: DWORD;
                     dwUser: DWORD_PTR;
@@ -1296,7 +1296,7 @@ Type
                      wMid: WORD;
                      wPid: WORD;
                      vDriverVersion: MMVERSION;
-                     szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                     szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                      wTechnology: WORD;
                      wReserved1: WORD;
                      dwSupport: DWORD;
@@ -1345,7 +1345,7 @@ Type
                          wMid: WORD;
                          wPid: WORD;
                          vDriverVersion: MMVERSION;
-                         szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                         szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                          fdwSupport: DWORD;
                          cDestinations: DWORD;
 		   End;
@@ -1389,13 +1389,13 @@ Type
                        cChannels: DWORD;
                        cConnections: DWORD;
                        cControls: DWORD;
-                       szShortName: array [0..Pred(MIXER_SHORT_NAME_CHARS)] Of CHAR;
-                       szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of CHAR;
+                       szShortName: array [0..Pred(MIXER_SHORT_NAME_CHARS)] Of AnsiChar;
+                       szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of AnsiChar;
                        Target: packed Record
                                 dwType,dwDeviceID: DWORD;
                                 wMid,wPid: WORD;
                                 vDriverVersion: MMVERSION;
-                                szPname: array[0..pred(MAXPNAMELEN)] Of Char;
+                                szPname: array[0..pred(MAXPNAMELEN)] Of AnsiChar;
 				End;
 		       End;
  MIXERLINEA   = _MIXERLINEA;
@@ -1444,8 +1444,8 @@ Type
                           dwControlType: DWORD;
                           fdwControl: DWORD;
                           cMultipleItems: DWORD;
-                          szShortName: array [0..Pred(MIXER_SHORT_NAME_CHARS)] Of CHAR;
-                          szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of CHAR;
+                          szShortName: array [0..Pred(MIXER_SHORT_NAME_CHARS)] Of AnsiChar;
+                          szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of AnsiChar;
                           Bounds: packed Record
                                            Case integer Of
                                              0: (lMinimum, lMaximum: longint);
@@ -1552,7 +1552,7 @@ Type
  _MIXERCONTROLDETAILS_LISTTEXTA = packed Record
                                           dwParam1: DWORD;
                                           dwParam2: DWORD;
-                                          szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of CHAR;
+                                          szName: array [0..Pred(MIXER_LONG_NAME_CHARS)] Of AnsiChar;
 					  End;
  MIXERCONTROLDETAILS_LISTTEXTA   = _MIXERCONTROLDETAILS_LISTTEXTA;
  PMIXERCONTROLDETAILS_LISTTEXTA  = ^_MIXERCONTROLDETAILS_LISTTEXTA;
@@ -1623,7 +1623,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
  _JOYCAPSA = packed Record
                      wMid: WORD;
                      wPid: WORD;
-                     szPname: array [0..Pred(MAXPNAMELEN)] Of CHAR;
+                     szPname: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
                      wXmin: UINT;
                      wXmax: UINT;
                      wYmin: UINT;
@@ -1643,8 +1643,8 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
                      wMaxAxes: UINT;
                      wNumAxes: UINT;
                      wMaxButtons: UINT;
-                     szRegKey: array [0..Pred(MAXPNAMELEN)] Of CHAR;
-                     szOEMVxD: array [0..Pred(MAX_JOYSTICKOEMVXDNAME)] Of CHAR;
+                     szRegKey: array [0..Pred(MAXPNAMELEN)] Of AnsiChar;
+                     szOEMVxD: array [0..Pred(MAX_JOYSTICKOEMVXDNAME)] Of AnsiChar;
 		   End;
  JOYCAPSA   = _JOYCAPSA;
  PJOYCAPSA  = ^_JOYCAPSA;
@@ -1731,7 +1731,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
  TJOYINFOEX  = JOYINFOEX;
 
  FOURCC = DWORD;
- HPSTR = ^char;
+ HPSTR = ^AnsiChar;
  HMMIO = THandle;
  LPMMIOPROC =
      Function (x1: LPSTR; x2: UINT; x3, x4: LPARAM): LRESULT;stdcall;
@@ -1856,7 +1856,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
 
  _MCI_INFO_PARMSA = packed Record
                             dwCallback: DWORD_PTR;
-                            lpstrReturn: PChar;
+                            lpstrReturn: PAnsiChar;
                             dwRetSize: DWORD;
 			  End;
  MCI_INFO_PARMSA   = _MCI_INFO_PARMSA;
@@ -1895,7 +1895,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
 
  _MCI_SYSINFO_PARMSA = packed Record
                                dwCallback: DWORD_PTR;
-                               lpstrReturn: PChar;
+                               lpstrReturn: PAnsiChar;
                                dwRetSize: DWORD;
                                dwNumber: DWORD;
                                wDeviceType: UINT;
@@ -2407,7 +2407,7 @@ Type // Delphi compatibility
 (*////////////////////////////////////////////////////////*)
 Function mmioStringToFOURCCA(x1: LPCSTR; x2: UINT): FOURCC;stdcall; external 'winmm.dll' name 'mmioStringToFOURCCA';
 Function mmioStringToFOURCCW(x1: LPCWSTR; x2: UINT): FOURCC;stdcall; external 'winmm.dll' name 'mmioStringToFOURCCW';
-Function mmioStringToFOURCC(x1: PChar; x2: UINT): FOURCC;stdcall; external 'winmm.dll' name
+Function mmioStringToFOURCC(x1: PAnsiChar; x2: UINT): FOURCC;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mmioStringToFOURCCW'
  {$else}'mmioStringToFOURCCA'
  {$endif};
@@ -2419,19 +2419,19 @@ Function mmioInstallIOProc(x1: FOURCC; x2: LPMMIOPROC; x3: DWORD): LPMMIOPROC;st
  {$endif};
 Function mmioOpenA(x1: LPSTR; x2: LPMMIOINFO; x3: DWORD): HMMIO;stdcall; external 'winmm.dll' name 'mmioOpenA';
 Function mmioOpenW(x1: LPWSTR; x2: LPMMIOINFO; x3: DWORD): HMMIO;stdcall; external 'winmm.dll' name 'mmioOpenW';
-Function mmioOpen(x1: PChar; x2: LPMMIOINFO; x3: DWORD): HMMIO;stdcall; external 'winmm.dll' name
+Function mmioOpen(x1: PAnsiChar; x2: LPMMIOINFO; x3: DWORD): HMMIO;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mmioOpenW'
  {$else}'mmioOpenA'
  {$endif};
 Function mmioRenameA(x1: LPCSTR; x2: LPCSTR; x3: LPCMMIOINFO; x4: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'mmioRenameA';
 Function mmioRenameW(x1: LPCWSTR; x2: LPCWSTR; x3: LPCMMIOINFO; x4: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'mmioRenameW';
-Function mmioRename(x1: PChar; x2: PChar; x3: LPCMMIOINFO; x4: DWORD): MMRESULT;stdcall; external 'winmm.dll' name
+Function mmioRename(x1: PAnsiChar; x2: PAnsiChar; x3: LPCMMIOINFO; x4: DWORD): MMRESULT;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mmioRenameW'
  {$else}'mmioRenameA'
  {$endif};
 Function mmioClose(x1: HMMIO; x2: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'mmioClose';
 Function mmioRead(x1: HMMIO; x2: HPSTR; x3: LONG): LONG;stdcall; external 'winmm.dll' name 'mmioRead';
-Function mmioWrite(x1: HMMIO; x2: pchar; x3: LONG): LONG;stdcall; external 'winmm.dll' name 'mmioWrite';
+Function mmioWrite(x1: HMMIO; x2: PAnsiChar; x3: LONG): LONG;stdcall; external 'winmm.dll' name 'mmioWrite';
 Function mmioSeek(x1: HMMIO; x2: LONG; x3: WINT): LONG;stdcall; external 'winmm.dll' name 'mmioSeek';
 Function mmioGetInfo(x1: HMMIO; x2: LPMMIOINFO; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'mmioGetInfo';
 Function mmioSetInfo(x1: HMMIO; x2: LPCMMIOINFO; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'mmioSetInfo';
@@ -2448,19 +2448,19 @@ Function mciSendCommand(x1: MCIDEVICEID; x2: UINT; x3: DWORD_PTR; x4: DWORD_PTR)
  {$ifdef UNICODE}'mciSendCommandW' {$else}'mciSendCommandA' {$endif};
 Function mciSendStringA(x1: LPCSTR; x2: LPSTR; x3: UINT; x4: HWND): MCIERROR;stdcall; external 'winmm.dll' name 'mciSendStringA';
 Function mciSendStringW(x1: LPCWSTR; x2: LPWSTR; x3: UINT; x4: HWND): MCIERROR;stdcall; external 'winmm.dll' name 'mciSendStringW';
-Function mciSendString(x1: PChar; x2: PChar; x3: UINT; x4: HWND): MCIERROR;stdcall; external 'winmm.dll' name
+Function mciSendString(x1: PAnsiChar; x2: PAnsiChar; x3: UINT; x4: HWND): MCIERROR;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mciSendStringW' {$else}'mciSendStringA' {$endif};
 Function mciGetDeviceIDA(x1: LPCSTR): MCIDEVICEID;stdcall; external 'winmm.dll' name 'mciGetDeviceIDA';
 Function mciGetDeviceIDW(x1: LPCWSTR): MCIDEVICEID;stdcall; external 'winmm.dll' name 'mciGetDeviceIDW';
-Function mciGetDeviceID(x1: PChar): MCIDEVICEID;stdcall; external 'winmm.dll' name
+Function mciGetDeviceID(x1: PAnsiChar): MCIDEVICEID;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mciGetDeviceIDW' {$else}'mciGetDeviceIDA' {$endif};
 Function mciGetDeviceIDFromElementIDA(x1: DWORD; x2: LPCSTR): MCIDEVICEID;stdcall; external 'winmm.dll' name 'mciGetDeviceIDFromElementIDA';
 Function mciGetDeviceIDFromElementIDW(x1: DWORD; x2: LPCWSTR): MCIDEVICEID;stdcall; external 'winmm.dll' name 'mciGetDeviceIDFromElementIDW';
-Function mciGetDeviceIDFromElementID(x1: DWORD; x2: PChar): MCIDEVICEID;stdcall; external 'winmm.dll' name
+Function mciGetDeviceIDFromElementID(x1: DWORD; x2: PAnsiChar): MCIDEVICEID;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mciGetDeviceIDFromElementIDW' {$else}'mciGetDeviceIDFromElementIDA' {$endif};
 Function mciGetErrorStringA(x1: MCIERROR; x2: LPSTR; x3: UINT): BOOL;stdcall; external 'winmm.dll' name 'mciGetErrorStringA';
 Function mciGetErrorStringW(x1: MCIERROR; x2: LPWSTR; x3: UINT): BOOL;stdcall; external 'winmm.dll' name 'mciGetErrorStringW';
-Function mciGetErrorString(x1: MCIERROR; x2: PChar; x3: UINT): BOOL;stdcall; external 'winmm.dll' name
+Function mciGetErrorString(x1: MCIERROR; x2: PAnsiChar; x3: UINT): BOOL;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'mciGetErrorStringW' {$else}'mciGetErrorStringA' {$endif};
 Function mciSetYieldProc(x1: MCIDEVICEID; x2: YIELDPROC; x3: DWORD): BOOL;stdcall; external 'winmm.dll' name 'mciSetYieldProc';
 Function mciGetCreatorTask(x1: MCIDEVICEID): HTASK;stdcall; external 'winmm.dll' name 'mciGetCreatorTask';
@@ -2481,7 +2481,7 @@ Function waveOutGetVolume(x1: HWAVEOUT; x2: LPDWORD): MMRESULT;stdcall; external
 Function waveOutSetVolume(x1: HWAVEOUT; x2: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'waveOutSetVolume';
 Function waveOutGetErrorTextA(x1: MMRESULT; x2: LPSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'waveOutGetErrorTextA';
 Function waveOutGetErrorTextW(x1: MMRESULT; x2: LPWSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'waveOutGetErrorTextW';
-Function waveOutGetErrorText(x1: MMRESULT; x2: PChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
+Function waveOutGetErrorText(x1: MMRESULT; x2: PAnsiChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'waveOutGetErrorTextW' {$else}'waveOutGetErrorTextA' {$endif};
 Function waveOutOpen(x1: LPHWAVEOUT; x2: UINT; x3: LPCWAVEFORMATEX; x4: DWORD_PTR; x5: DWORD_PTR;
                      x6: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'waveOutOpen';
@@ -2507,7 +2507,7 @@ Function waveInGetDevCaps(x1: UINT; x2: LPWAVEINCAPS; x3: UINT): MMRESULT;stdcal
  {$ifdef UNICODE}'waveInGetDevCapsW' {$else}'waveInGetDevCapsA' {$endif};
 Function waveInGetErrorTextA(x1: MMRESULT; x2: LPSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'waveInGetErrorTextA';
 Function waveInGetErrorTextW(x1: MMRESULT; x2: LPWSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'waveInGetErrorTextW';
-Function waveInGetErrorText(x1: MMRESULT; x2: PChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
+Function waveInGetErrorText(x1: MMRESULT; x2: PAnsiChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'waveInGetErrorTextW' {$else}'waveInGetErrorTextA' {$endif};
 Function waveInOpen(x1: LPHWAVEIN; x2: UINT; x3: LPCWAVEFORMATEX; x4: DWORD_PTR; x5: DWORD_PTR; x6 : DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'waveInOpen';
 Function waveInClose(x1: HWAVEIN): MMRESULT;stdcall; external 'winmm.dll' name 'waveInClose';
@@ -2576,7 +2576,7 @@ Function midiOutGetVolume(x1: HMIDIOUT; x2: LPDWORD): MMRESULT;stdcall; external
 Function midiOutSetVolume(x1: HMIDIOUT; x2: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'midiOutSetVolume';
 Function midiOutGetErrorTextA(x1: MMRESULT; x2: LPSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'midiOutGetErrorTextA';
 Function midiOutGetErrorTextW(x1: MMRESULT; x2: LPWSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'midiOutGetErrorTextW';
-Function midiOutGetErrorText(x1: MMRESULT; x2: PChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
+Function midiOutGetErrorText(x1: MMRESULT; x2: PAnsiChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'midiOutGetErrorTextW' {$else}'midiOutGetErrorTextA' {$endif};
 Function midiOutOpen(x1: LPHMIDIOUT; x2: UINT; x3: DWORD_PTR; x4: DWORD_PTR; x5: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'midiOutOpen';
 Function midiOutClose(x1: HMIDIOUT): MMRESULT;stdcall; external 'winmm.dll' name 'midiOutClose';
@@ -2596,7 +2596,7 @@ Function midiInGetDevCaps(x1: UINT; x2: LPMIDIINCAPS; x3: UINT): MMRESULT;stdcal
  {$ifdef UNICODE}'midiInGetDevCapsW' {$else}'midiInGetDevCapsA' {$endif};
 Function midiInGetErrorTextA(x1: MMRESULT; x2: LPSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'midiInGetErrorTextA';
 Function midiInGetErrorTextW(x1: MMRESULT; x2: LPWSTR; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name 'midiInGetErrorTextW';
-Function midiInGetErrorText(x1: MMRESULT; x2: PChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
+Function midiInGetErrorText(x1: MMRESULT; x2: PAnsiChar; x3: UINT): MMRESULT;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'midiInGetErrorTextW' {$else}'midiInGetErrorTextA' {$endif};
 Function midiInOpen(x1: LPHMIDIIN; x2: UINT; x3: DWORD_PTR; x4: DWORD_PTR; x5: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'midiInOpen';
 Function midiInClose(x1: HMIDIIN): MMRESULT;stdcall; external 'winmm.dll' name 'midiInClose';
@@ -2615,7 +2615,7 @@ Function mixerGetLineInfo(x1: HMIXEROBJ; x2: LPMIXERLINE; x3: DWORD): MMRESULT;s
 Function mixerGetID(x1: HMIXEROBJ; Var x2: UINT; x3: DWORD): MMRESULT;stdcall; external 'winmm.dll' name 'mixerGetID';
 Function PlaySoundA(x1: LPCSTR; x2: HMODULE; x3: DWORD): BOOL;stdcall; external 'winmm.dll' name 'PlaySoundA';
 Function PlaySoundW(x1: LPCWSTR; x2: HMODULE; x3: DWORD): BOOL;stdcall; external 'winmm.dll' name 'PlaySoundW';
-Function PlaySound(x1: PChar; x2: HMODULE; x3: DWORD): BOOL;stdcall; external 'winmm.dll' name
+Function PlaySound(x1: PAnsiChar; x2: HMODULE; x3: DWORD): BOOL;stdcall; external 'winmm.dll' name
  {$ifdef UNICODE}'PlaySoundW' {$else}'PlaySoundA' {$endif};
 
 implementation

+ 5 - 5
packages/winunits-base/src/multimon.pp

@@ -84,7 +84,7 @@ type
     rcMonitor: TRect;
     rcWork: TRect;
     dwFlags: DWORD;
-    szDevice: array[0..CCHDEVICENAME - 1] of Char;
+    szDevice: array[0..CCHDEVICENAME - 1] of AnsiChar;
   end;
   MONITORINFOEXA = tagMONITORINFOEXA;
   LPMONITORINFOEXA = ^tagMONITORINFOEXA;
@@ -123,11 +123,11 @@ type
 type
   _DISPLAY_DEVICEA = record
     cb: DWORD;
-    DeviceName: array[0..31] of Char;
-    DeviceString: array[0..127] of Char;
+    DeviceName: array[0..31] of AnsiChar;
+    DeviceString: array[0..127] of AnsiChar;
     StateFlags: DWORD;
-    DeviceID: array[0..127] of Char;
-    DeviceKey: array[0..127] of Char;
+    DeviceID: array[0..127] of AnsiChar;
+    DeviceKey: array[0..127] of AnsiChar;
   end;
   DISPLAY_DEVICEA = _DISPLAY_DEVICEA;
   PDISPLAY_DEVICEA = ^_DISPLAY_DEVICEA;

+ 3 - 3
packages/winunits-base/src/richedit.pp

@@ -610,7 +610,7 @@ Const
           crTextColor : COLORREF;
           bCharSet : BYTE;
           bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of char;
+          szFaceName : array[0..(LF_FACESIZE)-1] of AnsiChar;
        end;
      CHARFORMATA = _charformat;
      TCHARFORMATA = _charformat;
@@ -638,7 +638,7 @@ Const
           crTextColor : COLORREF;
           bCharSet : BYTE;
           bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of char;
+          szFaceName : array[0..(LF_FACESIZE)-1] of AnsiChar;
           wWeight : WORD;
           sSpacing : SHORT;
           crBackColor : COLORREF;
@@ -907,7 +907,7 @@ Const
      GETTEXTEX = _gettextex;
      TGETTEXTEX = _gettextex;
 
-     EDITWORDBREAKPROCEX = function (pchText:pchar; cchText:LONG; bCharSet:BYTE; action:LONG):LONG;
+     EDITWORDBREAKPROCEX = function (pchText:PAnsiChar; cchText:LONG; bCharSet:BYTE; action:LONG):LONG;
   { Defines for EM_SETTYPOGRAPHYOPTIONS  }
 
   const

+ 7 - 7
packages/winunits-base/src/shellapi.pp

@@ -1568,20 +1568,20 @@ Type
                                    uCallbackMessage     : UINT;
                                    hIcon                : HICON;
                                    {$ifdef IELower5}
-                                    szTip               : array[0..63] of CHAR;
+                                    szTip               : array[0..63] of AnsiChar;
                                    {$else}
-                                    szTip               : array[0..127] of CHAR;
+                                    szTip               : array[0..127] of AnsiChar;
                                    {$endif}
                                    {$ifdef IEhigherEqual5}
                                     dwState             : DWORD;
                                     dwStateMask         : DWORD;
-                                    szInfo              : array[0..255] of CHAR;
+                                    szInfo              : array[0..255] of AnsiChar;
                                     DUMMYUNIONNAME      : record
                                                            case longint of
                                                                0 : ( uTimeout : UINT );
                                                                1 : ( uVersion : UINT );
                                                               end;
-                                    szInfoTitle : array[0..63] of CHAR;
+                                    szInfoTitle : array[0..63] of AnsiChar;
                                     dwInfoFlags : DWORD;
                                    {$endif}
                                    {$ifdef IEHighEq6}
@@ -1614,7 +1614,7 @@ Type
                                                                0 : ( uTimeout : UINT );
                                                                1 : ( uVersion : UINT );
                                                               end;
-                                    szInfoTitle : array[0..63] of CHAR;
+                                    szInfoTitle : array[0..63] of AnsiChar;
                                     dwInfoFlags : DWORD;
                                    {$endif}
                                    {$ifdef IEHighEq6}
@@ -1739,8 +1739,8 @@ Function Shell_NotifyIcon( dwMessage: Dword;lpData: PNOTIFYICONDATAW):Bool;exter
                                             hIcon         : HICON;                          { out: icon }
                                             iIcon         : longint;                        { out: icon index }
                                             dwAttributes  : DWORD;                          { out: SFGAO_ flags }
-                                            szDisplayName : array[0..(MAX_PATH)-1] of CHAR; { out: display name (or path) }
-                                            szTypeName    : array[0..79] of CHAR;           { out: type name }
+                                            szDisplayName : array[0..(MAX_PATH)-1] of AnsiChar; { out: display name (or path) }
+                                            szTypeName    : array[0..79] of AnsiChar;           { out: type name }
                                            end;
        SHFILEINFOA                      = _SHFILEINFOA;
        TSHFILEINFOA                     = _SHFILEINFOA;

+ 3 - 3
packages/winunits-base/src/shfolder.pp

@@ -83,16 +83,16 @@ Const
 
 { Original entry points }
 
-Function SHGetFolderPathA(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
+Function SHGetFolderPathA(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PAnsiChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
 Function SHGetFolderPathW(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PWideChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathW';
 
-Function SHGetFolderPath (Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
+Function SHGetFolderPath (Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PAnsiChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
 
 
 { For Delphi compatibility }
 
 type
-  PFNSHGetFolderPathA = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall;
+  PFNSHGetFolderPathA = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PAnsiChar): HRESULT; stdcall;
   PFNSHGetFolderPathW = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PWideChar): HRESULT; stdcall;
   PFNSHGetFolderPath = PFNSHGetFolderPathA;
 

+ 10 - 10
packages/winunits-base/src/shlobj.pp

@@ -1040,7 +1040,7 @@ Type
      SHELLVIEWID = TGUID;
      TSHELLVIEWID = TGUID;
      PSHELLVIEWID = ^TGUID;
-     LPVIEWSETTINGS = Pchar;
+     LPVIEWSETTINGS = PAnsiChar;
 
      _CMInvokeCommandInfoEx = record
           cbSize : DWORD;                 { must be sizeof(CMINVOKECOMMANDINFOEX) }
@@ -1127,7 +1127,7 @@ Type
      PEXP_DARWIN_LINK = ^EXP_DARWIN_LINK;
      EXP_DARWIN_LINK = record
           dbh : DATABLOCK_HEADER;
-          szDarwinID : array[0..(MAX_PATH)-1] of CHAR;    { ANSI darwin ID associated with link }
+          szDarwinID : array[0..(MAX_PATH)-1] of AnsiChar;    { ANSI darwin ID associated with link }
           szwDarwinID : array[0..(MAX_PATH)-1] of WCHAR;  { UNICODE darwin ID associated with link }
        end;
      TEXP_DARWIN_LINK = EXP_DARWIN_LINK;
@@ -1149,7 +1149,7 @@ Type
      EXP_SZ_LINK = record
           cbSize : DWORD;                                 { Size of this extra data block }
           dwSignature : DWORD;                            { signature of this extra data block }
-          szTarget : array[0..(MAX_PATH)-1] of CHAR;      { ANSI target name w/EXP_SZ in it }
+          szTarget : array[0..(MAX_PATH)-1] of AnsiChar;      { ANSI target name w/EXP_SZ in it }
           swzTarget : array[0..(MAX_PATH)-1] of WCHAR;    { UNICODE target name w/EXP_SZ in it }
        end;
      LPEXP_SZ_LINK = PEXP_SZ_LINK;
@@ -1501,7 +1501,7 @@ Type
           ftLastWriteTime : FILETIME;
           nFileSizeHigh : DWORD;
           nFileSizeLow : DWORD;
-          cFileName : array[0..(MAX_PATH)-1] of CHAR;
+          cFileName : array[0..(MAX_PATH)-1] of AnsiChar;
        end;
      FILEDESCRIPTORA = _FILEDESCRIPTORA;
      TFILEDESCRIPTORA = _FILEDESCRIPTORA;
@@ -1731,16 +1731,16 @@ Type
      PROPPRG = record
           flPrg : WORD;
           flPrgInit : WORD;
-          achTitle : array[0..(PIFNAMESIZE)-1] of CHAR;
-          achCmdLine : array[0..((PIFSTARTLOCSIZE+PIFPARAMSSIZE)+1)-1] of CHAR;
-          achWorkDir : array[0..(PIFDEFPATHSIZE)-1] of CHAR;
+          achTitle : array[0..(PIFNAMESIZE)-1] of AnsiChar;
+          achCmdLine : array[0..((PIFSTARTLOCSIZE+PIFPARAMSSIZE)+1)-1] of AnsiChar;
+          achWorkDir : array[0..(PIFDEFPATHSIZE)-1] of AnsiChar;
           wHotKey : WORD;
-          achIconFile : array[0..(PIFDEFFILESIZE)-1] of CHAR;
+          achIconFile : array[0..(PIFDEFFILESIZE)-1] of AnsiChar;
           wIconIndex : WORD;
           dwEnhModeFlags : DWORD;
           dwRealModeFlags : DWORD;
-          achOtherFile : array[0..(PIFDEFFILESIZE)-1] of CHAR;
-          achPIFFile : array[0..(PIFMAXFILEPATH)-1] of CHAR;
+          achOtherFile : array[0..(PIFDEFFILESIZE)-1] of AnsiChar;
+          achPIFFile : array[0..(PIFMAXFILEPATH)-1] of AnsiChar;
        end;
      TPROPPRG = PROPPRG;
      PPPROPPRG = ^PPROPPRG;

+ 2 - 2
packages/winunits-base/src/shlwapi.pp

@@ -586,7 +586,7 @@ const
   function  StrCatChainW(pszDst:PWSTR; cchDst:DWORD; ichAt:DWORD; pszSrc:PCWSTR):DWORD;stdcall;external SHLWAPIDLL name 'StrCatChainW';
   function  StrRetToBSTR(pstr:PSTRRET; pidl:PCUITEMID_CHILD; out pbstr:BSTR):HRESULT;stdcall;external SHLWAPIDLL name 'StrRetToBSTR';
   function  SHLoadIndirectString(pszSource:PCWSTR; pszOutBuf:PWSTR; cchOutBuf:UINT; ppvReserved:Ppointer):HRESULT;stdcall;external SHLWAPIDLL name 'SHLoadIndirectString';
-  function  IsCharSpaceA(wch:CHAR):BOOL;stdcall;external SHLWAPIDLL name 'IsCharSpaceA';
+  function  IsCharSpaceA(wch:AnsiChar):BOOL;stdcall;external SHLWAPIDLL name 'IsCharSpaceA';
   function  IsCharSpaceW(wch:WCHAR):BOOL;stdcall;external SHLWAPIDLL name 'IsCharSpaceW';
   function  StrCmpCA(pszStr1:LPCSTR; pszStr2:LPCSTR):longint;stdcall;external SHLWAPIDLL name 'StrCmpCA';
   function  StrCmpCW(pszStr1:LPCWSTR; pszStr2:LPCWSTR):longint;stdcall;external SHLWAPIDLL name 'StrCmpCW';
@@ -937,7 +937,7 @@ const
 
  function SHSendMessageBroadcastA(uMsg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT;stdcall;external SHLWAPIDLL name 'SHSendMessageBroadcastA';
  function SHSendMessageBroadcastW(uMsg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT;stdcall;external SHLWAPIDLL name 'SHSendMessageBroadcastW';
- function SHStripMneumonicA(pszMenu:LPSTR):CHAR;stdcall;external SHLWAPIDLL name 'SHStripMneumonicA';
+ function SHStripMneumonicA(pszMenu:LPSTR):AnsiChar;stdcall;external SHLWAPIDLL name 'SHStripMneumonicA';
  function SHStripMneumonicW(pszMenu:LPWSTR):WCHAR;stdcall;external SHLWAPIDLL name 'SHStripMneumonicW';
  function IsOS(dwOS:DWORD):BOOL;stdcall;external SHLWAPIDLL name 'IsOS';
 (* Const before type ignored *)

+ 70 - 70
packages/winunits-base/src/typelib.pas

@@ -59,8 +59,8 @@ To load a different type of library resource, append an integer index to 'FileNa
 Example:  C:\WINDOWS\system32\msvbvm60.dll\3
 }
 
-function ImportTypelib(FileName: WideString;var sUnitName:string;var slDependencies:TStringList;
-  bActiveX,bPackage,bRemoveStructTag:boolean;var sPackageSource,sPackageRegUnitSource:String;inreftype :TParamInputRefType  = ParamInputVar):string;
+function ImportTypelib(FileName: WideString;var sUnitName:AnsiString;var slDependencies:TStringList;
+  bActiveX,bPackage,bRemoveStructTag:boolean;var sPackageSource,sPackageRegUnitSource:AnsiString;inreftype :TParamInputRefType  = ParamInputVar):AnsiString;
 
 
 Type
@@ -78,8 +78,8 @@ Type
     FPackageSource: TStringList;
     FPackageRegUnitSource: TStringList;
     FInputFileName: WideString;
-    FOutputFileName: String;
-    FUnitname: string;
+    FOutputFileName: AnsiString;
+    FUnitname: AnsiString;
     FUses : TStrings;
     FHeader : TStrings;
     FInterface : TStrings;
@@ -100,32 +100,32 @@ Type
     function GetPackageRegUnitSource: TStrings;
     procedure SetActiveX(AValue: Boolean);
     procedure SetCreatePackage(AValue: Boolean);
-    procedure SetOutputFileName(AValue: String);
+    procedure SetOutputFileName(AValue: AnsiString);
     procedure SetRemoveStructTag(AValue: Boolean);
-    procedure SetUnitName(AValue: string);
+    procedure SetUnitName(AValue: AnsiString);
   Protected
     bIsCustomAutomatable,bIsInterface,bIsAutomatable,bIsExternalDecl,bIsUserDefined:boolean;
     // Construct unit from header, uses, interface,
     procedure BuildUnit; virtual;
     // Add to various parts of sources
-    Procedure AddToUses(Const AUnit : String); virtual;
-    Procedure AddToHeader(Const ALine : String; AllowDuplicate : Boolean = False);virtual;
-    Procedure AddToHeader(Const Fmt : String; Args : Array of const; AllowDuplicate : Boolean = False);
-    Procedure AddToInterface(Const ALine : String);virtual;
-    Procedure AddToInterface(Const Fmt : String; Args : Array of const);
-    Procedure AddToImplementation(Const ALine : String);virtual;
-    Procedure AddToImplementation(Const Fmt : String; Args : Array of const);
+    Procedure AddToUses(Const AUnit : AnsiString); virtual;
+    Procedure AddToHeader(Const ALine : AnsiString; AllowDuplicate : Boolean = False);virtual;
+    Procedure AddToHeader(Const Fmt : AnsiString; Args : Array of const; AllowDuplicate : Boolean = False);
+    Procedure AddToInterface(Const ALine : AnsiString);virtual;
+    Procedure AddToInterface(Const Fmt : AnsiString; Args : Array of const);
+    Procedure AddToImplementation(Const ALine : AnsiString);virtual;
+    Procedure AddToImplementation(Const Fmt : AnsiString; Args : Array of const);
     // utility functions
-    function interfacedeclaration(iName, iDoc: string; TI: ITypeInfo; TA: LPTYPEATTR;
-      bIsDispatch,bCreateEvents:boolean): string;
+    function interfacedeclaration(iName, iDoc: AnsiString; TI: ITypeInfo; TA: LPTYPEATTR;
+      bIsDispatch,bCreateEvents:boolean): AnsiString;
     function VarTypeIsAutomatable(ParamType: integer): boolean; virtual;
-    function VarTypeToStr(ParamType: integer): string; virtual;
-    function TypeToString(TI: ITypeInfo; TD: TYPEDESC): string; virtual;
-    function ValidateID(id: string): boolean; virtual;
-    function ValidateIDAgainstDeclared(id: string): boolean; virtual;
-    function MakeValidId(id:string;out valid:string): boolean; virtual;
-    function MakeValidIdAgainstDeclared(id:string;var valid:string): boolean;
-    function RemoveTag(typename: string): string;
+    function VarTypeToStr(ParamType: integer): AnsiString; virtual;
+    function TypeToString(TI: ITypeInfo; TD: TYPEDESC): AnsiString; virtual;
+    function ValidateID(id: AnsiString): boolean; virtual;
+    function ValidateIDAgainstDeclared(id: AnsiString): boolean; virtual;
+    function MakeValidId(id:AnsiString;out valid:AnsiString): boolean; virtual;
+    function MakeValidIdAgainstDeclared(id:AnsiString;var valid:AnsiString): boolean;
+    function RemoveTag(typename: AnsiString): AnsiString;
     // The actual routines that do the work.
     procedure CreateCoClasses(const TL: ITypeLib; TICount: Integer); virtual;
     procedure CreateForwards(const TL: ITypeLib; TICount: Integer); virtual;
@@ -159,11 +159,11 @@ Type
     // File to read typelib from.
     Property InputFileName : WideString Read FInputFileName Write FInputFileName;
     // If set, unit source will be written to this file.
-    Property OutputFileName : String Read FOutputFileName Write SetOutputFileName;
+    Property OutputFileName : AnsiString Read FOutputFileName Write SetOutputFileName;
     // Remove tag from struct names
     Property RemoveStructTag : Boolean read FRemoveStructTag write SetRemoveStructTag Default False;
     // Set automatically by OutputFileName or by Execute
-    Property UnitName : string Read FUnitname Write SetUnitName;
+    Property UnitName : AnsiString Read FUnitname Write SetUnitName;
     // generate constref for [in] parameters instead of delphi compatible VAR, mantis 30764
     Property InParamRefStyle  : TParamInputRefType read fInParamRefStyle write FInParamRefStyle;
   end;
@@ -174,8 +174,8 @@ implementation
 Resourcestring
   SErrInvalidUnitName = 'Invalid unit name : %s';
 
-function ImportTypelib(FileName: WideString;var sUnitName:string;var slDependencies:TStringList;
-  bActiveX,bPackage,bRemoveStructTag:boolean;var sPackageSource,sPackageRegUnitSource:String;inreftype :TParamInputRefType  = ParamInputVar):string;
+function ImportTypelib(FileName: WideString;var sUnitName:AnsiString;var slDependencies:TStringList;
+  bActiveX,bPackage,bRemoveStructTag:boolean;var sPackageSource,sPackageRegUnitSource:AnsiString;inreftype :TParamInputRefType  = ParamInputVar):AnsiString;
 var i:integer;
 begin
   With TTypeLibImporter.Create(Nil) do
@@ -211,7 +211,7 @@ result:=ParamType in [vt_i1,vt_ui1,vt_i2,vt_ui2,vt_i4,vt_ui4,vt_uint,
             VT_LPWSTR,VT_LPSTR];
 end;
 
-function TTypeLibImporter.VarTypeToStr(ParamType:integer): string;
+function TTypeLibImporter.VarTypeToStr(ParamType:integer): AnsiString;
 
 begin
   case ParamType of
@@ -244,18 +244,18 @@ begin
     VT_INT:Result:='SYSINT';
     VT_SAFEARRAY:Result:='PSafeArray';
     VT_LPWSTR:Result:='PWideChar';
-    VT_LPSTR:Result:='PChar';
+    VT_LPSTR:Result:='PAnsiChar';
     VT_DECIMAL:Result:='TDecimal';
   else
     Result := 'Unknown (' + IntToStr(ParamType) + ')';
   end;
 end;
 
-function TTypeLibImporter.ValidateID(id:string):boolean;
+function TTypeLibImporter.ValidateID(id:AnsiString):boolean;
 
 const
   RESERVEDCNT=111;
-  RESERVED:array[1..RESERVEDCNT] of string=
+  RESERVED:array[1..RESERVEDCNT] of AnsiString=
   ('absolute','and','array','asm','begin','break','case','const',
   'constructor','continue','destructor','div','do','downto','else','end',
   'file','for','function','goto','if','implementation','in','inherited',
@@ -273,7 +273,7 @@ const
   'true','trunc','write','writeln');
 
 var
-  sl:string;
+  sl:AnsiString;
   i:integer;
 
 begin
@@ -287,7 +287,7 @@ begin
       end;
 end;
 
-function TTypeLibImporter.ValidateIDAgainstDeclared(id: string): boolean;
+function TTypeLibImporter.ValidateIDAgainstDeclared(id: AnsiString): boolean;
 var i:integer;
 begin
   id:=lowercase(id);
@@ -301,7 +301,7 @@ begin
   result:=i<0;
 end;
 
-function TTypeLibImporter.MakeValidId(id:string;out valid:string): boolean;
+function TTypeLibImporter.MakeValidId(id:AnsiString;out valid:AnsiString): boolean;
 begin
   result:= ValidateID(id);
   if result then
@@ -310,7 +310,7 @@ begin
     valid:=id+'_';
 end;
 
-function TTypeLibImporter.MakeValidIdAgainstDeclared(id:string;var valid:string): boolean;
+function TTypeLibImporter.MakeValidIdAgainstDeclared(id:AnsiString;var valid:AnsiString): boolean;
 begin
   result:= ValidateIDAgainstDeclared(id) and ValidateID(id);
   if result then
@@ -319,7 +319,7 @@ begin
     MakeValidIdAgainstDeclared(id+'_',valid);
 end;
 
-function TTypeLibImporter.RemoveTag(typename: string): string;
+function TTypeLibImporter.RemoveTag(typename: AnsiString): AnsiString;
 begin
   result:=typename;
   if FRemoveStructTag and (pos('tag',typename)>0) then
@@ -332,7 +332,7 @@ begin
 end;
 
 
-function TTypeLibImporter.TypeToString(TI:ITypeInfo; TD:TYPEDESC):string;
+function TTypeLibImporter.TypeToString(TI:ITypeInfo; TD:TYPEDESC):AnsiString;
 
 var
   TIref: ITypeInfo;
@@ -342,7 +342,7 @@ var
   BstrName : WideString;
   il:LongWord;
   i,idims:integer;
-  sl,sRefSrc,sKey:string;
+  sl,sRefSrc,sKey:AnsiString;
   Handle:HKEY;
   bWasPointer:boolean;
 begin
@@ -400,7 +400,7 @@ begin
       il:=MAX_PATH;
       SetLength(sRefSrc,il);
       sKey:=format('\TypeLib\%s\%d.%d\0\win32',[GUIDToString(LARef^.GUID),LARef^.wMajorVerNum,LARef^.wMinorVerNum]);
-      if (RegOpenKeyEx(HKEY_CLASSES_ROOT,pchar(sKey),0,KEY_READ,Handle) = ERROR_SUCCESS) then
+      if (RegOpenKeyEx(HKEY_CLASSES_ROOT,PAnsiChar(sKey),0,KEY_READ,Handle) = ERROR_SUCCESS) then
         begin
         if RegQueryValue(Handle,nil,@sRefSrc[1],@il) = ERROR_SUCCESS then
           begin
@@ -446,8 +446,8 @@ begin
   bIsAutomatable:=VarTypeIsAutomatable(TD.vt) or bIsCustomAutomatable;
 end;
 
-function TTypeLibImporter.interfacedeclaration(iName,iDoc:string;TI:ITypeInfo;TA:LPTYPEATTR;
-  bIsDispatch,bCreateEvents:boolean):string;
+function TTypeLibImporter.interfacedeclaration(iName,iDoc:AnsiString;TI:ITypeInfo;TA:LPTYPEATTR;
+  bIsDispatch,bCreateEvents:boolean):AnsiString;
 
 type
   TPropertyDef=record
@@ -459,7 +459,7 @@ type
     sdoc,
     sParam,
     sDefault,
-    sPutSuffix:string;
+    sPutSuffix:AnsiString;
   end;
 
 var
@@ -467,8 +467,8 @@ var
   TIref: ITypeInfo;
   BstrName,BstrNameRef,BstrDocString : WideString;
   s,sl,sPropDispIntfc,sType,sConv,sFunc,sPar,sVarName,sMethodName,
-  sPropParam,sPropParam2,sPropParam3,tmp: string;
-  sEventSignatures,sEventFunctions,sEventProperties,sEventImplementations:string;
+  sPropParam,sPropParam2,sPropParam3,tmp: AnsiString;
+  sEventSignatures,sEventFunctions,sEventProperties,sEventImplementations:AnsiString;
   i,j,k:integer;
   FD: lpFUNCDESC;
   BL : array[0..99] of TBstr;
@@ -478,7 +478,7 @@ var
   VD: lpVARDESC;
   aPropertyDefs:array of TPropertyDef;
   Propertycnt,iType:integer;
-  Modifier: string;
+  Modifier: AnsiString;
 
   function findProperty(ireqdispid:integer):integer;
   var i:integer;
@@ -511,7 +511,7 @@ var
       end;
   end;
 
-  function GetName(i:integer):string;  //bug in Office10\MSacc.OLB _WizHook.Key
+  function GetName(i:integer):AnsiString;  //bug in Office10\MSacc.OLB _WizHook.Key
   begin
     result:='';
     if i<integer(cnt) then
@@ -984,7 +984,7 @@ end;
 procedure TTypeLibImporter.DoBuildPackage;
 var
   i : integer;
-  sl:string;
+  sl:AnsiString;
 begin
   if FAXClasses.Count=0 then  //nothing to do
     exit;
@@ -1074,7 +1074,7 @@ Procedure TTypeLibImporter.ImportEnums(Const TL : ITypeLib; TICount : Integer);
 
 Var
   i,j : integer;
-  sl ,senum, stype: string;
+  sl ,senum, stype: AnsiString;
   BstrName, BstrDocString, BstrHelpFile : WideString;
   dwHelpContext: DWORD;
   TI:ITypeInfo;
@@ -1150,7 +1150,7 @@ Var
   TIT: TYPEKIND;
   RTIT : HREFTYPE;
   ITF:WINT;
-  sl,slref:string;
+  sl,slref:AnsiString;
 
 begin
   // Forward declarations
@@ -1227,12 +1227,12 @@ Var
   TIT: TYPEKIND;
   VD: lpVARDESC;
   slDeferredType,slDeferredPendingType,slDeferredDeclaration:TStrings;
-  sl,sldeclaration,stype,smembername,srecordname:string;
+  sl,sldeclaration,stype,smembername,srecordname:AnsiString;
   bIsDeferred:boolean;
 
-  procedure ReleasePendingType(sPen:string);
+  procedure ReleasePendingType(sPen:AnsiString);
   var k:integer;
-    sDec,sTyp:string;
+    sDec,sTyp:AnsiString;
   begin
     k:=slDeferredPendingType.IndexOf(sPen);
     while (k>=0) do
@@ -1372,13 +1372,13 @@ Var
   //TAref2 : LPTYPEATTR;
   TIT : TYPEKIND;
   RTIT : HREFTYPE;
-  sl: string;
+  sl: AnsiString;
   slDeclaredType,slDeferredType,slDeferredPendingType,slDeferredDeclaration: Tstrings;
   bDeferred:boolean;
 
-  procedure ReleasePendingType(sPen:string);
+  procedure ReleasePendingType(sPen:AnsiString);
   var k:integer;
-    sDec,sTyp:string;
+    sDec,sTyp:AnsiString;
   begin
     slDeclaredType.Add(sPen);
     k:=slDeferredPendingType.IndexOf(sPen);
@@ -1496,11 +1496,11 @@ Var
   TA,TARef : LPTYPEATTR;
   TIT : TYPEKIND;
   RTIT : HREFTYPE;
-  sDefIntf, sDefEvents : string;
+  sDefIntf, sDefEvents : AnsiString;
   ITF:WINT;
   RegHandle:HKEY;
   il,il2:LongWord;
-  sRefSrc,sKey,sl:string;
+  sRefSrc,sKey,sl:AnsiString;
   resHandle:hmodule;
   bmhandle:handle;
   pData:pByte;
@@ -1649,7 +1649,7 @@ begin
       AddToImplementation('  Result := CreateComObject(CLASS_%s) as %s;',[BstrName,sDefIntf]);
       AddToImplementation('end;');
       AddToImplementation('');
-      AddToImplementation('Class Function Co%s.CreateRemote(const MachineName: string): %s;',[BstrName,sDefIntf]);
+      AddToImplementation('Class Function Co%s.CreateRemote(const MachineName: String): %s;',[BstrName,sDefIntf]);
       AddToImplementation('begin');
       AddToImplementation('  Result := CreateRemoteComObject(MachineName,CLASS_%s) as %s;',[BstrName,sDefIntf]);
       AddToImplementation('end;');
@@ -1716,7 +1716,7 @@ begin
         SetLength(sRefSrc,il);
         sKey:=format('\CLSID\%s\ToolboxBitmap32',[GUIDToString(TA^.GUID)]);
         bmhandle:=0;
-        if (RegOpenKeyEx(HKEY_CLASSES_ROOT,pchar(sKey),0,KEY_READ,RegHandle) = ERROR_SUCCESS) then
+        if (RegOpenKeyEx(HKEY_CLASSES_ROOT,PAnsiChar(sKey),0,KEY_READ,RegHandle) = ERROR_SUCCESS) then
           begin
           if RegQueryValue(RegHandle,nil,@sRefSrc[1],@il) = ERROR_SUCCESS then
             begin
@@ -1724,7 +1724,7 @@ begin
             sl:=trim(copy(sRefSrc,pos(',',sRefSrc)+1,length(sRefSrc))); //format: filename, id
             sRefSrc:=copy(sRefSrc,1,pos(',',sRefSrc)-1);
             //Load bitmap
-            ResHandle:=LoadLibraryExA(pchar(sRefSrc),0,$00000022); //LOAD_LIBRARY_AS_IMAGE_RESOURCE or LOAD_LIBRARY_AS_DATAFILE
+            ResHandle:=LoadLibraryExA(PAnsiChar(sRefSrc),0,$00000022); //LOAD_LIBRARY_AS_IMAGE_RESOURCE or LOAD_LIBRARY_AS_DATAFILE
             if (ResHandle<>0) then
               begin
               bmhandle:=FindResource(ResHandle,makeintresource(StrToIntDef(sl,0)),RT_BITMAP);
@@ -1835,7 +1835,7 @@ end;
 procedure TTypeLibImporter.BuildUnit;
 
 Var
-  l : string;
+  l : AnsiString;
   I : Integer;
 
 begin
@@ -1864,10 +1864,10 @@ end;
 
 { TTypeLibImporter }
 
-procedure TTypeLibImporter.SetOutputFileName(AValue: String);
+procedure TTypeLibImporter.SetOutputFileName(AValue: AnsiString);
 
 Var
-  UN : String;
+  UN : AnsiString;
 
 begin
   if FOutputFileName=AValue then Exit;
@@ -1884,7 +1884,7 @@ begin
   FRemoveStructTag:=AValue;
 end;
 
-procedure TTypeLibImporter.SetUnitName(AValue: string);
+procedure TTypeLibImporter.SetUnitName(AValue: AnsiString);
 begin
   if FUnitname=AValue then Exit;
   if not IsValidIdent(AVAlue) then
@@ -1894,13 +1894,13 @@ begin
     OutputFileName:=ExtractFilePath(OutputFileName)+UnitName+'.pas';
 end;
 
-procedure TTypeLibImporter.AddToUses(const AUnit: String);
+procedure TTypeLibImporter.AddToUses(const AUnit: AnsiString);
 begin
   If FUses.IndexOf(AUnit)=-1 then
     FUses.add(AUnit);
 end;
 
-procedure TTypeLibImporter.AddToHeader(const ALine: String;
+procedure TTypeLibImporter.AddToHeader(const ALine: AnsiString;
   AllowDuplicate: Boolean);
 
 begin
@@ -1908,29 +1908,29 @@ begin
     FHeader.Add(ALine);
 end;
 
-procedure TTypeLibImporter.AddToHeader(const Fmt: String; Args: array of const;
+procedure TTypeLibImporter.AddToHeader(const Fmt: AnsiString; Args: array of const;
   AllowDuplicate: Boolean);
 begin
   AddToheader(Format(Fmt,Args),AllowDuplicate)
 end;
 
-procedure TTypeLibImporter.AddToInterface(const ALine: String);
+procedure TTypeLibImporter.AddToInterface(const ALine: AnsiString);
 begin
   FInterface.Add(ALine);
 end;
 
-procedure TTypeLibImporter.AddToInterface(const Fmt: String;
+procedure TTypeLibImporter.AddToInterface(const Fmt: AnsiString;
   Args: array of const);
 begin
   FInterface.Add(Format(Fmt,Args));
 end;
 
-procedure TTypeLibImporter.AddToImplementation(const ALine: String);
+procedure TTypeLibImporter.AddToImplementation(const ALine: AnsiString);
 begin
   FImplementation.Add(ALine);
 end;
 
-procedure TTypeLibImporter.AddToImplementation(const Fmt: String;
+procedure TTypeLibImporter.AddToImplementation(const Fmt: AnsiString;
   Args: array of const);
 begin
   FImplementation.Add(Format(Fmt,Args));

+ 2 - 2
packages/winunits-base/src/urlmon.pp

@@ -1051,10 +1051,10 @@ Function RegisterMediaTypes(ctypes : UINT; const rgszTypes : LPCSTR; const rgcfT
 Function RevokeBindStatusCallback(pBC : IBindCtx; pBSCb : IBindStatusCallback) : HResult; stdcall; external liburlmon;
 Function RevokeFormatEnumerator(pBC : IBindCtx; pEFetc : IEnumFormatEtc) : HResult; stdcall; external liburlmon;
 Function SetSoftwareUpdateAdvertisementState(szDistUnit : LPCWSTR;dwAdState, dwAdvertisedVersionMS, dwAdvertisedVersionLS : DWORD) : HResult; stdcall; external liburlmon;
-Function URLDownloadToCacheFile(p1 : IUnknown; p2 : PAnsiChar; p3 : PChar; p4 : DWORD; p5 : DWORD; p6 : IBindStatusCallback) : HResult; stdcall; external liburlmon name 'URLDownloadToCacheFileA';
+Function URLDownloadToCacheFile(p1 : IUnknown; p2 : PAnsiChar; p3 : PAnsiChar; p4 : DWORD; p5 : DWORD; p6 : IBindStatusCallback) : HResult; stdcall; external liburlmon name 'URLDownloadToCacheFileA';
 Function URLDownloadToCacheFileA(p1 : IUnknown; p2 : PAnsiChar; p3 : PAnsiChar; p4 : DWORD; p5 : DWORD; p6 : IBindStatusCallback) : HResult; stdcall; external liburlmon;
 Function URLDownloadToCacheFileW(p1 : IUnknown; p2 : PWideChar; p3 : PWideChar; p4 : DWORD; p5 : DWORD; p6 : IBindStatusCallback) : HResult; stdcall; external liburlmon;
-Function URLDownloadToFile(Caller : IUnknown; URL : PAnsiChar; FileName : PChar; Reserved : DWORD; StatusCB : IBindStatusCallback) : HResult; stdcall; external liburlmon name 'URLDownloadToFileA';
+Function URLDownloadToFile(Caller : IUnknown; URL : PAnsiChar; FileName : PAnsiChar; Reserved : DWORD; StatusCB : IBindStatusCallback) : HResult; stdcall; external liburlmon name 'URLDownloadToFileA';
 Function URLDownloadToFileA(Caller : IUnknown; URL : PAnsiChar; FileName : PAnsiChar; Reserved : DWORD; StatusCB : IBindStatusCallback) : HResult; stdcall; external liburlmon;
 Function URLDownloadToFileW(Caller : IUnknown; URL : PWideChar; FileName : PWideChar; Reserved : DWORD; StatusCB : IBindStatusCallback) : HResult; stdcall; external liburlmon;
 Function UrlMkGetSessionOption(dwOption : DWORD; pBuffer : Pointer; dwBufferLength : DWORD; pdwBufferLength : PDWORD; dwReserved : DWORD) : HResult; stdcall; external liburlmon;

+ 5 - 5
packages/winunits-base/src/wininet.pp

@@ -1681,7 +1681,7 @@ Type
           cLeashed : longint;
           cDowngraded : longint;
           cBlocked : longint;
-          pszLocation : ^char;
+          pszLocation : ^AnsiChar;
        end;
      TIncomingCookieState = IncomingCookieState;
 	 PIncomingCookieState = ^IncomingCookieState;
@@ -1690,7 +1690,7 @@ Type
      OutgoingCookieState = record
           cSent : longint;
           cSuppressed : longint;
-          pszLocation : ^char;
+          pszLocation : ^AnsiChar;
        end;
      ToutgoingCookieState = outgoingCookieState;
 	 PoutgoingCookieState = ^outgoingCookieState;
@@ -1714,12 +1714,12 @@ Type
 	 PCookieDecision = ^CookieDecision;
 	 LPCookieDecision = PCookieDecision;
      GOPHER_FIND_DATAA = record
-          DisplayString : array[0..(MAX_GOPHER_DISPLAY_TEXT+1)-1] of CHAR;
+          DisplayString : array[0..(MAX_GOPHER_DISPLAY_TEXT+1)-1] of AnsiChar;
           GopherType : DWORD;
           SizeLow : DWORD;
           SizeHigh : DWORD;
           LastModificationTime : FILETIME;
-          Locator : array[0..(MAX_GOPHER_LOCATOR_LENGTH+1)-1] of CHAR;
+          Locator : array[0..(MAX_GOPHER_LOCATOR_LENGTH+1)-1] of AnsiChar;
        end;
      LPGOPHER_FIND_DATAA = ^GOPHER_FIND_DATAA;
 	 TGOPHER_FIND_DATAA = GOPHER_FIND_DATAA;
@@ -2005,7 +2005,7 @@ Type
             dwDiskUsage : DWORD;
             dwDiskQuota : DWORD;
             dwOwnerStorage : array[0..(GROUP_OWNER_STORAGE_SIZE)-1] of DWORD;
-            szGroupName : array[0..(GROUPNAME_MAX_LENGTH)-1] of CHAR;
+            szGroupName : array[0..(GROUPNAME_MAX_LENGTH)-1] of AnsiChar;
          end;
        INTERNET_CACHE_GROUP_INFOA = _INTERNET_CACHE_GROUP_INFOA;
        LPINTERNET_CACHE_GROUP_INFOA = ^_INTERNET_CACHE_GROUP_INFOA;

+ 2 - 2
packages/winunits-base/tests/OOTest.pp

@@ -96,7 +96,7 @@ begin
     try
         StatusBar1.SimpleText := 'Getting database pointer ...';
         res := Sample.getDatabasePointer(Edit4.Text, Edit3.Text);
-        Application.MessageBox(PChar('the pointer: ' + res), PChar('Result'), ID_OK);
+        Application.MessageBox(PAnsiChar('the pointer: ' + res), PAnsiChar('Result'), ID_OK);
         StatusBar1.SimpleText := 'Ready';
     except
         StatusBar1.SimpleText := 'Error';
@@ -110,7 +110,7 @@ begin
     try
         StatusBar1.SimpleText := 'Getting cell content ...';
         res := Sample.getCellContent(Edit6.Text);
-        Application.MessageBox(PChar('the content: ' + res), PChar('Result'), ID_OK);
+        Application.MessageBox(PAnsiChar('the content: ' + res), PAnsiChar('Result'), ID_OK);
         StatusBar1.SimpleText := 'Ready';
     except
         StatusBar1.SimpleText := 'Error';

+ 2 - 2
packages/winunits-base/tests/hhex.pp

@@ -23,13 +23,13 @@ Begin
   
   // HH_DISPLAY_INDEX  or HH_DISPLAY_SEARCH work too. 
   Writeln('calling TOC');
-  Res:=HtmlHelpA(0,pchar(helpfilename) ,HH_DISPLAY_TOC,0);	
+  Res:=HtmlHelpA(0,PAnsiChar(helpfilename) ,HH_DISPLAY_TOC,0);	
   Writeln('program now blocked on readln, press enter (in console window) to continue');
   
   readln;
   writeln('Showing a topic that is probably about dialog.');
   // probably because due to automatic generation filenames and exact contact can drift.
-  Res:=HtmlHelpA(0,pchar(helpfilename) ,HH_DISPLAY_TOPIC,ptruint(pchar(htmltopic)));	 
+  Res:=HtmlHelpA(0,PAnsiChar(helpfilename) ,HH_DISPLAY_TOPIC,ptruint(PAnsiChar(htmltopic)));	 
   Writeln('program now blocked on readln, press enter (in console window) to continue');
   readln;
   Writeln('ready. Note that the windows die automatically on exit of the program');

+ 2 - 2
packages/winunits-base/tests/hhex2.pp

@@ -31,10 +31,10 @@ Begin
   ah.fIndexOnFail:= false;
 
  
-  Res:=HtmlHelpA(0,pchar(helpfilename) ,HH_DISPLAY_INDEX,PTRUINT(PAnsiChar(Keyword)));	
+  Res:=HtmlHelpA(0,PAnsiChar(helpfilename) ,HH_DISPLAY_INDEX,PTRUINT(PAnsiChar(Keyword)));	
 
   // keyword search seems to have same effect.
-  Res:=HtmlHelpA(0,pchar(helpfilename) ,HH_ALINK_LOOKUP,PTRUINT(AH));	
+  Res:=HtmlHelpA(0,PAnsiChar(helpfilename) ,HH_ALINK_LOOKUP,PTRUINT(AH));	
   writeln(ah.pszkeywords);
   writeln(ah.pszurl);
   writeln(ah.pszmsgtext);