* PChar -> PAnsiChar

This commit is contained in:
Michaël Van Canneyt 2023-01-14 14:21:30 +01:00
parent 878e9349e8
commit 4072e73f12
4 changed files with 16 additions and 16 deletions

View File

@ -19,7 +19,7 @@ type
procedure OnConnect(const Event:ENetEvent); procedure OnConnect(const Event:ENetEvent);
procedure OnReceive(const Event:ENetEvent; var BroadcastMsg : Boolean; var BroadcastChannel : Byte); procedure OnReceive(const Event:ENetEvent; var BroadcastMsg : Boolean; var BroadcastChannel : Byte);
procedure ProcessLoop; procedure ProcessLoop;
procedure SendMessage(AMessage: String); procedure SendMessage(AMessage: AnsiString);
procedure WriteHelp; procedure WriteHelp;
Protected Protected
Procedure DoRun; override; Procedure DoRun; override;
@ -49,9 +49,9 @@ begin
Inherited; Inherited;
end; end;
procedure TClientApplication.SendMessage(AMessage : String); procedure TClientApplication.SendMessage(AMessage : AnsiString);
begin begin
myClient.BroadcastMsg(1,PChar(AMessage),Length(AMessage)+1,[ENetPacketReliable]); myClient.BroadcastMsg(1,PAnsiChar(AMessage),Length(AMessage)+1,[ENetPacketReliable]);
end; end;
procedure TClientApplication.ProcessLoop; procedure TClientApplication.ProcessLoop;
@ -62,7 +62,7 @@ end;
procedure TClientApplication.DoConnect; procedure TClientApplication.DoConnect;
Var Var
H : String; H : AnsiString;
P : Integer; P : Integer;
begin begin
H:=GetOptionValue('H','host'); H:=GetOptionValue('H','host');
@ -85,9 +85,9 @@ end;
procedure TClientApplication.OnReceive(const Event: ENetEvent; var BroadcastMsg: Boolean; procedure TClientApplication.OnReceive(const Event: ENetEvent; var BroadcastMsg: Boolean;
var BroadcastChannel: Byte); var BroadcastChannel: Byte);
var var
msg : string; msg : AnsiString;
begin begin
msg := StrPas(PChar(Event.packet^.data)); msg := StrPas(PAnsiChar(Event.packet^.data));
Writeln('Received : "',Msg,'"'); Writeln('Received : "',Msg,'"');
end; end;
@ -109,7 +109,7 @@ end;
procedure TClientApplication.DoRun; procedure TClientApplication.DoRun;
Var Var
I,PingCount,MessageCount : Integer; I,PingCount,MessageCount : Integer;
Msg : String; Msg : AnsiString;
begin begin
if HasOption('h','help') then if HasOption('h','help') then
begin begin

View File

@ -122,10 +122,10 @@ end;
procedure TServerApplication.OnReceive(const Event: ENetEvent; var BroadcastMsg: Boolean; procedure TServerApplication.OnReceive(const Event: ENetEvent; var BroadcastMsg: Boolean;
var BroadcastChannel: Byte); var BroadcastChannel: Byte);
var var
msg : string; msg : AnsiString;
begin begin
ResetIdle; ResetIdle;
msg := PChar(Event.packet^.data); msg := PAnsiChar(Event.packet^.data);
Writeln('Received message on channel : ',Event.channelID,' connected ID ,',Event.peer^.connectID,' (peer : ',Event.peer^.address.host,' port ',Event.peer^.address.port,')'); Writeln('Received message on channel : ',Event.channelID,' connected ID ,',Event.peer^.connectID,' (peer : ',Event.peer^.address.host,' port ',Event.peer^.address.port,')');
Writeln('Message reads : "',Msg,'"'); Writeln('Message reads : "',Msg,'"');
end; end;

View File

@ -616,10 +616,10 @@ function enet_socket_shutdown( socket: ENetSocket; how: ENetSocketShutdown ): ci
procedure enet_socket_destroy( socket: ENetSocket ); libraryENet; procedure enet_socket_destroy( socket: ENetSocket ); libraryENet;
function enet_socketset_select( maxSocket: ENetSocket; readSet: pENetSocketSet; writeSet: pENetSocketSet; timeout: enet_uint32 ): cint; libraryENet; function enet_socketset_select( maxSocket: ENetSocket; readSet: pENetSocketSet; writeSet: pENetSocketSet; timeout: enet_uint32 ): cint; libraryENet;
function enet_address_set_host_ip( address: pENetAddress; const hostName: PChar ): cint; libraryENet; function enet_address_set_host_ip( address: pENetAddress; const hostName: PAnsiChar ): cint; libraryENet;
function enet_address_set_host( address: pENetAddress; const hostName: PChar ): cint; libraryENet; function enet_address_set_host( address: pENetAddress; const hostName: PAnsiChar ): cint; libraryENet;
function enet_address_get_host_ip( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet; function enet_address_get_host_ip( const address: pENetAddress; hostName: PAnsiChar; nameLength: csize_t ): cint; libraryENet;
function enet_address_get_host( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet; function enet_address_get_host( const address: pENetAddress; hostName: PAnsiChar; nameLength: csize_t ): cint; libraryENet;
function enet_packet_create( const data: Pointer; dataLength: csize_t; flags: enet_uint32 ): pENetPacket; libraryENet; function enet_packet_create( const data: Pointer; dataLength: csize_t; flags: enet_uint32 ): pENetPacket; libraryENet;
procedure enet_packet_destroy( packet: pENetPacket ); libraryENet; procedure enet_packet_destroy( packet: pENetPacket ); libraryENet;

View File

@ -54,7 +54,7 @@ type
private private
FInit : Boolean; FInit : Boolean;
FHostname : string; FHostname : AnsiString;
FAddress : ENetAddress; FAddress : ENetAddress;
FIsServer : Boolean; FIsServer : Boolean;
@ -82,7 +82,7 @@ type
function InitHost(): Boolean; function InitHost(): Boolean;
procedure DeinitHost(); procedure DeinitHost();
function Connect( const Host: string; Port: Word ): Boolean; function Connect( const Host: AnsiString; Port: Word ): Boolean;
function Disconnect( bNow: Boolean ): Boolean; function Disconnect( bNow: Boolean ): Boolean;
function SendMsg( Channel: Byte; Data: Pointer; Length: Integer; function SendMsg( Channel: Byte; Data: Pointer; Length: Integer;
flag: TENetPacketFlags; WaitResponse: Boolean = False ): Boolean; flag: TENetPacketFlags; WaitResponse: Boolean = False ): Boolean;
@ -181,7 +181,7 @@ begin
FHost := nil; FHost := nil;
end; end;
function TENetClass.Connect( const Host: string; Port: Word ): Boolean; function TENetClass.Connect( const Host: AnsiString; Port: Word ): Boolean;
begin begin
Result := False; Result := False;
if not FIsServer then begin if not FIsServer then begin