paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 06:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* PChar -> PAnsiChar

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-01-14 18:03:09 +01:00
parent 6de2577251
commit 550af49112
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-extra/src/daemonapp.pp
View File

@ -133,7 +133,7 @@ Type
Constructor Create(AOwner : TComponent); override;
Destructor Destroy; override;
Procedure StartService; virtual;
Procedure Main(Argc : DWord; Args : PPChar); Virtual;
Procedure Main(Argc : DWord; Args : PPAnsiChar); Virtual;
Procedure Controller(ControlCode,EventType : DWord; EventData : Pointer); Virtual;
Function ReportStatus : Boolean; virtual;
Property Daemon : TCustomDaemon Read FDaemon;
@ -367,7 +367,7 @@ Type
procedure SysUnInstallDaemon(Daemon: TCustomDaemon);
function UnInstallRun: Boolean;
function RunDaemonsRun: Boolean;
Procedure Main(Argc : DWord; Args : PPchar);
Procedure Main(Argc : DWord; Args : PPAnsiChar);
Function RunGUIloop(P : Pointer) : integer;
Protected
// OS (System) dependent calls
@ -772,7 +772,7 @@ begin
// No Borland compatibility needed, as the install will take care of the -r
end;
procedure TCustomDaemonApplication.Main(Argc: DWord; Args: PPchar);
procedure TCustomDaemonApplication.Main(Argc: DWord; Args: PPAnsiChar);
Var
SN : String;

2
packages/fcl-extra/src/fileinfo.pp
View File

@ -206,7 +206,7 @@ var
Stream: TResourceStream;
begin
FreeResources;
Stream := TResourceStream.CreateFromID(Instance, 1, {$ifdef FPC_OS_UNICODE}PWideChar{$else}PChar{$endif}(RT_VERSION));
Stream := TResourceStream.CreateFromID(Instance, 1, {$ifdef FPC_OS_UNICODE}PWideChar{$else}PAnsiChar{$endif}(RT_VERSION));
try
FVersionInfo:=TVersionResource.Create;
FVersionInfo.SetCustomRawDataStream(Stream);

2
packages/fcl-extra/src/unix/daemonapp.inc
View File

@ -157,7 +157,7 @@ begin
Main(0,Nil);
end;
procedure TDaemonController.Main(Argc: DWord; Args: PPChar);
procedure TDaemonController.Main(Argc: DWord; Args: PPAnsiChar);
Var
T : TThread;

52
packages/fcl-extra/src/win/ServiceManager.pas
View File

@ -203,7 +203,7 @@ ResourceString
{$ifdef ver130}
Type
PCharArray = Array[Word] of PChar;
PCharArray = Array[Word] of PAnsiChar;
PPCharArray = ^PCharArray;
Procedure RaiseLastOSError;
@ -227,14 +227,14 @@ end;
procedure TServiceManager.Connect;
Var
P : PChar;
P : PAnsiChar;
begin
If (FHandle=0) then
begin
P:=Nil;
If (MachineName<>'') then
P:=PChar(MachineName);
P:=PAnsiChar(MachineName);
FHandle:=OpenSCManager(P,Nil,FAccess);
If (FHandle=0) then
RaiseLastOSError;
@ -308,7 +308,7 @@ begin
FDisplayName:=StrPas(lpDisplayName);
SetStatusFields(ServiceStatus);
end;
PChar(P):=Pchar(P)+SizeOf(TEnumServiceStatus);
PAnsiChar(P):=PAnsiChar(P)+SizeOf(TEnumServiceStatus);
end;
Finally
FreeMem(Info);
@ -424,7 +424,7 @@ begin
FBeforeDisconnect(Self);
end;
Function AllocDependencyList (Const S : String) : PChar;
Function AllocDependencyList (Const S : String) : PAnsiChar;
Var
I,L : Integer;
@ -448,7 +448,7 @@ end;
Function TServiceManager.RegisterService(var Desc: TServiceDescriptor) : Thandle;
Var
PDep,PLO,PUser,PPWd : PChar; // We need Nil for some things.
PDep,PLO,PUser,PPWd : PAnsiChar; // We need Nil for some things.
N,D : String;
ReturnTag : DWord;
@ -460,19 +460,19 @@ begin
If (LoadOrderGroup='') then
PLO:=Nil
else
PLO:=PChar(LoadOrderGroup);
PLO:=PAnsiChar(LoadOrderGroup);
PPwd:=Nil;
PUser:=Nil;
If (UserName<>'') then
begin
PUser:=PChar(UserName);
PUser:=PAnsiChar(UserName);
If (Password<>'') then
PPWd:=PChar(Password);
PPWd:=PAnsiChar(Password);
end;
PDep:=AllocDependencyList(Dependencies);
Try
Result:=CreateService(Self.Handle,PChar(N),PChar(D),DesiredAccess,ServiceType,
StartType,ErrorControl,PChar(CommandLine),PLO,Nil,
Result:=CreateService(Self.Handle,PAnsiChar(N),PAnsiChar(D),DesiredAccess,ServiceType,
StartType,ErrorControl,PAnsiChar(CommandLine),PLO,Nil,
PDep,PUser,PPwd);
If (Result=0) then
RaiseLastOSError;
@ -489,7 +489,7 @@ Var
H : THandle;
begin
H:=OpenService(Handle,PChar(ServiceName),SERVICE_ENUMERATE_DEPENDENTS);
H:=OpenService(Handle,PAnsiChar(ServiceName),SERVICE_ENUMERATE_DEPENDENTS);
try
ListDependentServices(H,ServiceState,List);
Finally
@ -520,7 +520,7 @@ begin
For I:=0 to Count-1 do
begin
List.Add(StrPas(E^.lpServiceName));
Pchar(E):=PChar(E)+SizeOf(TEnumServiceStatus);
PAnsiChar(E):=PAnsiChar(E)+SizeOf(TEnumServiceStatus);
end;
Finally
FreeMem(P);
@ -567,7 +567,7 @@ begin
A:=SERVICE_STOP or SERVICE_QUERY_STATUS;
If StopDependent then
A:=A or SERVICE_ENUMERATE_DEPENDENTS;
H:=OpenService(Handle,PChar(ServiceName),A);
H:=OpenService(Handle,PAnsiChar(ServiceName),A);
Try
StopService(H,StopDependent);
Finally
@ -579,7 +579,7 @@ end;
Function TServiceManager.GetServiceHandle(const ServiceName : String; SAccess : DWord) : THandle;
begin
Result:=OpenService(Handle,PChar(ServiceName),SAccess);
Result:=OpenService(Handle,PAnsiChar(ServiceName),SAccess);
If (Result=0) then
RaiseLastOSError;
end;
@ -649,7 +649,7 @@ begin
end;
end;
Function StringsToPCharList(List : TStrings) : PPChar;
Function StringsToPCharList(List : TStrings) : PPAnsiChar;
Var
I : Integer;
@ -657,25 +657,25 @@ Var
begin
I:=(List.Count)+1;
GetMem(Result,I*sizeOf(PChar));
GetMem(Result,I*sizeOf(PAnsiChar));
PPCharArray(Result)^[List.Count]:=Nil;
For I:=0 to List.Count-1 do
begin
S:=List[i];
PPCharArray(Result)^[i]:=StrNew(PChar(S));
PPCharArray(Result)^[i]:=StrNew(PAnsiChar(S));
end;
end;
Procedure FreePCharList(List : PPChar);
Procedure FreePCharList(List : PPAnsiChar);
Var
I : integer;
begin
I:=0;
While PPChar(List)[i]<>Nil do
While PPAnsiChar(List)[i]<>Nil do
begin
StrDispose(PPChar(List)[i]);
StrDispose(PPAnsiChar(List)[i]);
Inc(I);
end;
FreeMem(List);
@ -685,7 +685,7 @@ Procedure TServiceManager.StartService(SHandle : THandle; Args : TStrings);
Var
Argc : DWord;
PArgs : PPchar;
PArgs : PPAnsiChar;
begin
If (Args=Nil) or (Args.Count>0) then
@ -699,7 +699,7 @@ begin
Pargs:=StringsToPcharList(Args);
end;
Try
If not jwawinsvc.StartService(SHandle,Argc,Pchar(PArgs)) then
If not jwawinsvc.StartService(SHandle,Argc,PAnsiChar(PArgs)) then
RaiseLastOSError;
Finally
If (PArgs<>Nil) then
@ -817,17 +817,17 @@ end;
procedure TServiceManager.ConfigService(SHandle : THandle ; Config : TServiceDescriptor);
Function SToPchar(Var S : String) : PChar;
Function SToPchar(Var S : String) : PAnsiChar;
begin
If (S='') then
Result:=Nil
else
Result:=PChar(S);
Result:=PAnsiChar(S);
end;
Var
PDep,PLO,PUser,PPWd,PCmd,PDisp : PChar; // We need Nil for some things.
PDep,PLO,PUser,PPWd,PCmd,PDisp : PAnsiChar; // We need Nil for some things.
D : String;
ReturnTag : DWord;

36
packages/fcl-extra/src/win/daemonapp.inc
View File

@ -40,11 +40,11 @@ begin
Application.Log(etError,Format(SerrNoControlContext,[dwControl,dwEventType,ptrint(lpEventData)]));
end;
Procedure ServiceMainEntry(Argc : DWord; Args : Pchar); stdcall;
Procedure ServiceMainEntry(Argc : DWord; Args : PAnsiChar); stdcall;
begin
If Assigned(Application) then
Application.Main(Argc,PPChar(Args));
Application.Main(Argc,PPAnsiChar(Args));
{$ifdef svcdebug}Debuglog('Main end');{$endif}
end;
@ -150,11 +150,11 @@ const
// Careful, result of this function must be freed !!
Function GetDependencies(D : TDependencies) : PChar;
Function GetDependencies(D : TDependencies) : PAnsiChar;
var
I,L : Integer;
P : PChar;
P : PAnsiChar;
begin
Result:=Nil;
@ -170,10 +170,10 @@ begin
begin
if D[i].IsGroup then
begin
P^:=Char(SC_GROUP_IDENTIFIER);
P^:=AnsiChar(SC_GROUP_IDENTIFIER);
Inc(P);
end;
P:=StrECopy(P,PChar(D[i].Name));
P:=StrECopy(P,PAnsiChar(D[i].Name));
Inc(P);
end;
P^:=#0;
@ -184,12 +184,12 @@ Procedure TCustomDaemonApplication.SysInstallDaemon(Daemon : TCustomDaemon);
Var
SM,SV: SC_HANDLE;
SD,N,DN,E,LG,UN,UP : String;
SD,N,DN,E,LG,UN,UP : AnsiString;
DD : TDaemonDef;
ST,STT,ES: Integer;
IDTag : DWord;
PIDTag : LPDWord;
PDeps,PN,PP : PChar;
PDeps,PN,PP : PAnsiChar;
D : TServiceDescriptionA;
begin
@ -211,12 +211,12 @@ begin
If (UN='') then
PN:=Nil
else
PN:=PChar(UN);
PN:=PAnsiChar(UN);
UP:=Password;
if (UP='') then
PP:=Nil
else
PP:=PChar(UP);
PP:=PAnsiChar(UP);
// ServiceType ST
ST:=WinServiceTypes[ServiceType];
if (doInteractive in DD.Options) and (ServiceType=stWin32) then
@ -237,13 +237,13 @@ begin
PDeps:=GetDependencies(Dependencies);
end;
Try
SV:=CreateService(SM, PChar(N), PChar(DN), SERVICE_ALL_ACCESS, ST, STT, ES,
PChar(E), PChar(LG), PIDTag, PDeps, PN, PP);
SV:=CreateService(SM, PAnsiChar(N), PAnsiChar(DN), SERVICE_ALL_ACCESS, ST, STT, ES,
PAnsiChar(E), PAnsiChar(LG), PIDTag, PDeps, PN, PP);
If (SV=0) then
RaiseLastOSError;
Try
SD:=DD.Description;
D.lpDescription:=Pchar(SD);
D.lpDescription:=PAnsiChar(SD);
ChangeServiceConfig2(SV,SERVICE_CONFIG_DESCRIPTION,@D);
If (PIDTag<>Nil) then
DD.WinBindings.IDTag:=IDTag;
@ -260,11 +260,11 @@ procedure TCustomDaemonApplication.SysUnInstallDaemon(Daemon: TCustomDaemon);
var
SM,SV : SC_HANDLE;
DN : String;
DN : AnsiString;
begin
SM:=TSMData(FSysData).FHandle;
DN:=Daemon.Definition.Name;
SV:=OpenService(SM,PChar(DN),SERVICE_ALL_ACCESS);
SV:=OpenService(SM,PAnsiChar(DN),SERVICE_ALL_ACCESS);
if (SV=0) then
RaiseLastOSError;
try
@ -346,7 +346,7 @@ begin
if Windows.RegisterClassA(AWClass) = 0 then
DaemonError(SErrWindowClass);
end;
GUIHandle := CreateWindowA(AWClass.lpszClassName, Pchar(Title),
GUIHandle := CreateWindowA(AWClass.lpszClassName, PAnsiChar(Title),
HandleOpts, 1,1, 0, 0, 0, 0, HInstance, nil);
end;
T:=TDaemonStartThread.Create(P,GUIHandle);
@ -392,7 +392,7 @@ begin
For I:=0 to C-1 do
If Assigned(FMapper.DaemonDefs[i].Instance) then
begin
P[i].lpServiceName:=Pchar(FMapper.DaemonDefs[i].Name);
P[i].lpServiceName:=PAnsiChar(FMapper.DaemonDefs[i].Name);
P[i].lpServiceProc:=@ServiceMainEntry;
end;
// Set last entry to Nil.
@ -506,7 +506,7 @@ begin
end;
procedure TDaemonController.Main(Argc: DWord; Args: PPChar);
procedure TDaemonController.Main(Argc: DWord; Args: PPAnsiChar);
Var
T : TThread;