Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
7231cd8f38

+ 9 - 9
packages/winceunits/src/cesync.pp

@@ -25,7 +25,7 @@ uses Windows {$ifdef UNDER_CE}, windbase {$endif};
 {$PACKRECORDS C}
 {$ELSE}
 type
-  TCHAR = char;
+  TCHAR = AnsiChar;
 {$ENDIF}
 
 { max size of the object type name }
@@ -37,7 +37,7 @@ const
    
 type
   OBJTYPENAME = array[0..MAX_OBJTYPE_NAME-1] of TCHAR;
-  OBJTYPENAMEA = array[0..MAX_OBJTYPE_NAME-1] of CHAR;
+  OBJTYPENAMEA = array[0..MAX_OBJTYPE_NAME-1] of AnsiChar;
   OBJTYPENAMEW = array[0..MAX_OBJTYPE_NAME-1] of WCHAR;
   
 { Error/Return code used }
@@ -138,9 +138,9 @@ const
 type
    tagDevInfo = record
         pid : DWORD;                             { device ID }
-        szName : array[0..(MAX_PATH)-1] of char; { device name }
-        szType : array[0..79] of char;           { device type }
-        szPath : array[0..(MAX_PATH)-1] of char; { device path }
+        szName : array[0..(MAX_PATH)-1] of AnsiChar; { device name }
+        szType : array[0..79] of AnsiChar;           { device type }
+        szPath : array[0..(MAX_PATH)-1] of AnsiChar; { device path }
      end;
    DEVINFO = tagDevInfo;
    PDEVINFO = ^DEVINFO;
@@ -223,10 +223,10 @@ type
         cbStruct : UINT;
         hIconLarge : HICON;
         hIconSmall : HICON;
-        szName : array[0..(MAX_PATH)-1] of char;
-        szSyncText : array[0..(MAX_PATH)-1] of char;
-        szTypeText : array[0..79] of char;
-        szPlTypeText : array[0..79] of char;
+        szName : array[0..(MAX_PATH)-1] of AnsiChar;
+        szSyncText : array[0..(MAX_PATH)-1] of AnsiChar;
+        szTypeText : array[0..79] of AnsiChar;
+        szPlTypeText : array[0..79] of AnsiChar;
      end;
    OBJUIDATA = tagObjUIData;
    POBJUIDATA = ^OBJUIDATA;

+ 1 - 1
packages/winceunits/src/commctrl.pp

@@ -558,7 +558,7 @@ type
     pszFormat  : LPCSTR;
     st         : SYSTEMTIME;
     pszDisplay : LPCSTR;
-    szDisplay  : Array[0..63] of CHAR;
+    szDisplay  : Array[0..63] of AnsiChar;
   end;
   NMDATETIMEFORMATA=tagNMDATETIMEFORMATA;
   TNMDATETIMEFORMATA=tagNMDATETIMEFORMATA;

+ 2 - 2
packages/winceunits/src/imm.pp

@@ -124,7 +124,7 @@ const
 type
      tagSTYLEBUFA = record
        dwStyle:DWORD;
-       szDescription:array[0..STYLE_DESCRIPTION_SIZE-1] of char;
+       szDescription:array[0..STYLE_DESCRIPTION_SIZE-1] of AnsiChar;
      end;
      STYLEBUFA = tagSTYLEBUFA;
      PSTYLEBUFA = ^STYLEBUFA;
@@ -167,7 +167,7 @@ type
        hbmpChecked:HBITMAP;
        hbmpUnchecked:HBITMAP;
        dwItemData:DWORD;
-       szString:array[0..IMEMENUITEM_STRING_SIZE-1] of char;
+       szString:array[0..IMEMENUITEM_STRING_SIZE-1] of AnsiChar;
        hbmpItem:HBITMAP;
      end;
      IMEMENUITEMINFOA = tagIMEMENUITEMINFOA;

+ 3 - 3
packages/winceunits/src/iphlpapi.pp

@@ -120,7 +120,7 @@ const
 
 type
     // IP_ADDRESS_STRING
-    IP_ADDRESS_STRING  = Array[0..3,0..3] of Char;
+    IP_ADDRESS_STRING  = Array[0..3,0..3] of AnsiChar;
     TIP_ADDRESS_STRING = IP_ADDRESS_STRING;
     IP_MASK_STRING     = IP_ADDRESS_STRING;
     TIP_MASK_STRING    = IP_ADDRESS_STRING;
@@ -143,8 +143,8 @@ type
     _IP_ADAPTER_INFO = Record
       Next                : PIP_ADAPTER_INFO;
       ComboIndex          : DWORD;
-      AdapterName         : Array[0..MAX_ADAPTER_NAME_LENGTH + 3] of Char;
-      Description         : Array[0..MAX_ADAPTER_DESCRIPTION_LENGTH + 3] of Char;
+      AdapterName         : Array[0..MAX_ADAPTER_NAME_LENGTH + 3] of AnsiChar;
+      Description         : Array[0..MAX_ADAPTER_DESCRIPTION_LENGTH + 3] of AnsiChar;
       AddressLength       : UINT;
       Address             : Array [0..MAX_ADAPTER_ADDRESS_LENGTH-1] of Byte;
       Index               : DWORD;

+ 2 - 2
packages/winceunits/src/keybd.pp

@@ -85,8 +85,8 @@ const
       KeyShiftRightAltFlag		= $00100000;  //  R alt is down.
       KeyShiftRightWinFlag		= $00080000;  //  R Win key is down.
       KeyShiftReserved40000		= $00040000;  //  Reserved.
-      KeyShiftDeadFlag			  = $00020000;  //  Corresponding char is dead char.
-      KeyShiftNoCharacterFlag	= $00010000;  //  No corresponding char.
+      KeyShiftDeadFlag			  = $00020000;  //  Corresponding AnsiChar is dead AnsiChar.
+      KeyShiftNoCharacterFlag	= $00010000;  //  No corresponding AnsiChar.
 
 			KeyShiftLanguageFlag1		= $00008000;  //  Use for language specific shifts.
       KeyShiftKeybdEventFlag	= $00004000;	//	Not for external use.

+ 4 - 4
packages/winceunits/src/mmsystem.pp

@@ -809,7 +809,7 @@ type
        wMid:word;                  //* manufacturer ID */
        wPid:word;                  //* product ID */
        vDriverVersion:MMVERSION;        //* version of the driver */
-       szPname:array[0..MAXPNAMELEN-1] of char;  //* product name (NULL terminated string) */
+       szPname:array[0..MAXPNAMELEN-1] of AnsiChar;  //* product name (NULL terminated string) */
        wTechnology:word;           //* type of device */
        wVoices:word;               //* # of voices (internal synth only) */
        wNotes:word;                //* max # of notes (internal synth only) */
@@ -889,7 +889,7 @@ type
        wMid:word;                  //* manufacturer ID */
        wPid:word;                  //* product ID */
        vDriverVersion:MMVERSION;        //* version of the driver */
-       szPname:array[0..MAXPNAMELEN-1] of char;  //* product name (NULL terminated string) */
+       szPname:array[0..MAXPNAMELEN-1] of AnsiChar;  //* product name (NULL terminated string) */
 //#if (WINVER >= 0x0400)
        dwSupport:DWORD;             //* functionality supported by driver */
 //#endif
@@ -1638,11 +1638,11 @@ const
       MMIOERR_INVALIDFILE         = MMIOERR_BASE + 16; //* default error file error */
 
 //* MMIO constants */
-      CFSEPCHAR       = '+';             //* compound file name separator char. */
+      CFSEPCHAR       = '+';             //* compound file name separator AnsiChar. */
 
 //* MMIO data types */
 type
-      HPSTR = ^char;          //* a huge version of LPSTR */
+      HPSTR = ^AnsiChar;          //* a huge version of LPSTR */
 
       HMMIO = HANDLE;                  //* a handle to an open file */
 

+ 2 - 2
packages/winceunits/src/pimstore.pp

@@ -754,8 +754,8 @@ const
 // Additional Prototypes for ALL interfaces
 {
 unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long __RPC_FAR *, unsigned long            , BSTR __RPC_FAR * );
-unsigned char __RPC_FAR * __RPC_USER  BSTR_UserMarshal(  unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * );
-unsigned char __RPC_FAR * __RPC_USER  BSTR_UserUnmarshal(unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * );
+unsigned AnsiChar __RPC_FAR * __RPC_USER  BSTR_UserMarshal(  unsigned long __RPC_FAR *, unsigned AnsiChar __RPC_FAR *, BSTR __RPC_FAR * );
+unsigned AnsiChar __RPC_FAR * __RPC_USER  BSTR_UserUnmarshal(unsigned long __RPC_FAR *, unsigned AnsiChar __RPC_FAR *, BSTR __RPC_FAR * );
 void                      __RPC_USER  BSTR_UserFree(     unsigned long __RPC_FAR *, BSTR __RPC_FAR * );
 }
 

+ 1 - 1
packages/winceunits/src/projects.pp

@@ -217,7 +217,7 @@ type
 const
       PA_MAX_PATHNAME = 96;		// including null terminator, practically speaking,
                              // might be " \storage card 3\My Documents\document
-                             // folder 7\very long filename.wav" or 69 char's max
+                             // folder 7\very long filename.wav" or 69 AnsiChar's max
 
 // Pure-NT machines don't necessarily define CEOID.  In the future, we'll want
 // to replace this define with the actual typedef (JParks).

+ 6 - 6
packages/winceunits/src/rapi.pp

@@ -335,9 +335,9 @@ type
   TCeGetSystemPowerStatusEx= function(pStatus: PSYSTEM_POWER_STATUS_EX; fUpdate: BOOL): BOOL stdcall;
 
   //added 10/16/2000 - Terence Goggin; [email protected]
-  TDesktopToDevice = function(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint stdcall;
+  TDesktopToDevice = function(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint stdcall;
   //added 01/19/2003 - Octavio Hernandez; [email protected]
-  TDeviceToDesktop = function(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint stdcall;
+  TDeviceToDesktop = function(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint stdcall;
 
   TCeRapiUninit = function : LongInt stdcall;
   TCeFindAllFiles = function(Path: PWideChar; Attr: DWORD; var Count: DWord;
@@ -434,9 +434,9 @@ function CeGetClassName(hWnd: HWND; lpClassName: LPWSTR; nMaxCount: integer): In
 procedure CeGlobalMemoryStatus(lpmst: PMemoryStatus);
 function CeGetSystemPowerStatusEx(pStatus: PSYSTEM_POWER_STATUS_EX; fUpdate: BOOL): BOOL;
 //added 10/16/2000 - Terence Goggin; [email protected]
-function DesktopToDevice(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint;
+function DesktopToDevice(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint;
 //added 01/19/2003 - Octavio Hernandez
-function DeviceToDesktop(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint;
+function DeviceToDesktop(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint;
 function CeRapiInvoke(pDllPath: LPCWSTR; pFunctionName: LPCWSTR; cbInput: DWord; pInput: PByte;
   pcbOutput: PDWord; ppOutput: PPByte; ppIRAPIStream: PIRAPIStream; dwReserved: DWord): HResult;
 
@@ -1470,7 +1470,7 @@ begin
 end;
 
 //added 10/16/00 - Terence Goggin; [email protected]
-function DesktopToDevice(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint;
+function DesktopToDevice(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint;
 begin
   if not AdoCELoaded then
   begin
@@ -1485,7 +1485,7 @@ begin
 end;
 
 //added 01/19/2003 - Octavio Hernandez
-function DeviceToDesktop(DesktopLocation, TableList: String; Sync: BOOL; Overwrite: Integer; DeviceLocation: String): Longint;
+function DeviceToDesktop(DesktopLocation, TableList: AnsiString; Sync: BOOL; Overwrite: Integer; DeviceLocation: AnsiString): Longint;
 begin
   if not AdoCELoaded then
   begin

+ 5 - 5
packages/winceunits/src/ril.pp

@@ -378,7 +378,7 @@ const
 // -----------------------------------------------------------------------------
 const
       RIL_NOTIFY_SIMNOTACCESSIBLE         = $00000001 or RIL_NCLASS_MISC;  // @constdefine SIM card has been removed or has failed to respond; lpData is NULL
-      RIL_NOTIFY_DTMFSIGNAL               = $00000002 or RIL_NCLASS_MISC;  // @constdefine A DTMF signal has been detected; lpData points to char
+      RIL_NOTIFY_DTMFSIGNAL               = $00000002 or RIL_NCLASS_MISC;  // @constdefine A DTMF signal has been detected; lpData points to AnsiChar
       RIL_NOTIFY_GPRSCLASS_NETWORKCHANGED = $00000003 or RIL_NCLASS_MISC;  // @constdefine Network has indicated a change in GPRS class
                                                                            // lpData points to a DWORD containing the new RIL_GPRSCLASS_* value
       RIL_NOTIFY_GPRSCLASS_RADIOCHANGED   = $00000004 or RIL_NCLASS_MISC;  // @constdefine The radio has indicated a change in GPRS class
@@ -6732,7 +6732,7 @@ function RIL_SetHideConnectedIdStatus(
 //
 // @func Retrieves the status for a Completion of Call to Busy Subscriber index.
 //
-// @comm Asynchronous.  If active, <p lpData> points to an array of <t char>s
+// @comm Asynchronous.  If active, <p lpData> points to an array of <t AnsiChar>s
 //       indicating the phone number for which CCBS is active.  If CCBS is not
 //       active for that entry, <p lpData> is <def NULL>.
 //
@@ -7000,7 +7000,7 @@ function RIL_SendDTMF(
 // -----------------------------------------------------------------------------
 function RIL_StartDTMF(
                        _hRil:HRIL;       // @parm handle to RIL instance returned by <f RIL_Initialize>
-                       ch:AnsiChar       // @parm alphanumeric char representing DTMF tones to be sent (0-9, A-D, *, #)
+                       ch:AnsiChar       // @parm alphanumeric AnsiChar representing DTMF tones to be sent (0-9, A-D, *, #)
                       ):HRESULT; external RILDLL name 'RIL_StartDTMF';
 
 // -----------------------------------------------------------------------------
@@ -7015,7 +7015,7 @@ function RIL_StartDTMF(
 // -----------------------------------------------------------------------------
 function RIL_StopDTMF(
                       _hRil:HRIL;       // @parm handle to RIL instance returned by <f RIL_Initialize>
-                      ch:AnsiChar       // @parm alphanumeric char representing DTMF tones to be stopped (0-9, A-D, *, #)
+                      ch:AnsiChar       // @parm alphanumeric AnsiChar representing DTMF tones to be stopped (0-9, A-D, *, #)
                      ):HRESULT; external RILDLL name 'RIL_StopDTMF';
                      
 // -----------------------------------------------------------------------------
@@ -7503,7 +7503,7 @@ function RIL_SendMsgAcknowledgement(
 //
 // @func Retrieves International Mobile Subscriber Identity of the phone user
 //
-// @comm Asynchronous.  <p lpData> points to an array of <t char>s
+// @comm Asynchronous.  <p lpData> points to an array of <t AnsiChar>s
 //
 // -----------------------------------------------------------------------------
 function RIL_GetUserIdentity(

+ 1 - 1
packages/winceunits/src/tsp.pp

@@ -254,7 +254,7 @@ type
     wszAddress                : array[0..CELLDEVCONFIG_MAXLENGTH_GPRSADDRESS-1] of WCHAR;//The packet address to use (if empty, then a dynamic address will be requested)
     dwDataCompression         : LongInt; //One of the CELLDEVCONFIG_GPRSCOMPRESSION_* constants
     dwHeaderCompression       : LongInt; //One of the CELLDEVCONFIG_GPRSCOMPRESSION_* constants
-    szParameters              : array[0..CELLDEVCONFIG_MAXLENGTH_GPRSPARAMETERS-1] of Char; //Prococol-specific parameters (NULL terminated)
+    szParameters              : array[0..CELLDEVCONFIG_MAXLENGTH_GPRSPARAMETERS-1] of AnsiChar; //Prococol-specific parameters (NULL terminated)
     bRequestedQOSSettingsValid: Boolean; //TRUE iff sgqsRequestedQOSSettings is valid
     cgqsRequestedQOSSettings  : CELLGPRSQOSSETTINGS;//GPRS QOS settings structure
     bMinimumQOSSettingsValid  : Boolean; //TRUE iff sgqsMinimumQOSSettings is valid

+ 5 - 5
packages/winceunits/src/wininet.pp

@@ -1522,7 +1522,7 @@ type
        cDowngraded:longint;   //               ... converted to session-cookies
        cBlocked:longint;      //               ... rejected
 
-       pszLocation:PChar;   // Optional: URL associated with reported cookie events
+       pszLocation:PAnsiChar;   // Optional: URL associated with reported cookie events
                             // This can be used to override request URL
      end;
 
@@ -1531,7 +1531,7 @@ type
        cSent:longint;
        cSuppressed:longint;
 
-       pszLocation:PChar;   // Optional: URL associated with reported cookie events
+       pszLocation:PAnsiChar;   // Optional: URL associated with reported cookie events
                             // This can be used to override request URL
      end;
 
@@ -1903,12 +1903,12 @@ const
 
 type
      GOPHER_FIND_DATAA = record
-        DisplayString:array[0..MAX_GOPHER_DISPLAY_TEXT] of char;
+        DisplayString:array[0..MAX_GOPHER_DISPLAY_TEXT] of AnsiChar;
         GopherType:DWORD; // GOPHER_TYPE_, if known
         SizeLow:DWORD;
         SizeHigh:DWORD;
         LastModificationTime:FILETIME;
-        Locator:array[0..MAX_GOPHER_LOCATOR_LENGTH] of char;
+        Locator:array[0..MAX_GOPHER_LOCATOR_LENGTH] of AnsiChar;
      end;
      LPGOPHER_FIND_DATAA = ^GOPHER_FIND_DATAA;
 
@@ -3348,7 +3348,7 @@ type
         dwDiskUsage:DWORD;  // in KB
         dwDiskQuota:DWORD;  // in KB
         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;