فهرست منبع

* PChar -> PAnsiChar

Michaël Van Canneyt 2 سال پیش
والد
کامیت
4072e73f12

+ 7 - 7
packages/libenet/examples/clientapp.pp

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

+ 2 - 2
packages/libenet/examples/serverapp.pp

@@ -122,10 +122,10 @@ end;
 procedure TServerApplication.OnReceive(const Event: ENetEvent; var BroadcastMsg: Boolean;
   var BroadcastChannel: Byte);
 var
-  msg : string;
+  msg : AnsiString;
 begin
   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('Message reads : "',Msg,'"');
 end;

+ 4 - 4
packages/libenet/src/enet.pp

@@ -616,10 +616,10 @@ function enet_socket_shutdown( socket: ENetSocket; how: ENetSocketShutdown ): ci
 procedure enet_socket_destroy( socket: ENetSocket ); 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( address: pENetAddress; const hostName: PChar ): cint; libraryENet;
-function enet_address_get_host_ip( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet;
-function enet_address_get_host( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet;
+function enet_address_set_host_ip( address: pENetAddress; const hostName: PAnsiChar ): cint; libraryENet;
+function enet_address_set_host( address: pENetAddress; const hostName: PAnsiChar ): 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: PAnsiChar; nameLength: csize_t ): cint; libraryENet;
 
 function enet_packet_create( const data: Pointer; dataLength: csize_t; flags: enet_uint32 ): pENetPacket; libraryENet;
 procedure enet_packet_destroy( packet: pENetPacket ); libraryENet;

+ 3 - 3
packages/libenet/src/uenetclass.pp

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