From d8594d15aea5d53c0aa4d32240ea458e83e53925 Mon Sep 17 00:00:00 2001 From: ocoursiere Date: Sun, 30 Mar 2003 16:39:48 +0000 Subject: [PATCH] Fixes : bad CRC error --- bepascal/bepascal/be/app/invoker.pp | 4 ++-- bepascal/bepascal/be/app/messenger.pp | 30 +++++++++++++------------- bepascal/bepascal/be/support/dataio.pp | 14 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bepascal/bepascal/be/app/invoker.pp b/bepascal/bepascal/be/app/invoker.pp index fd4aa02..dbcc7d3 100644 --- a/bepascal/bepascal/be/app/invoker.pp +++ b/bepascal/bepascal/be/app/invoker.pp @@ -62,8 +62,8 @@ type end; function BInvoker_Create(AObject : TBeObject) : TCplusObject; cdecl; external BePascalLibName name 'BInvoker_Create'; -function BInvoker_Create(AObject : TBeObject; message : TCplusObject; handler : TCplusObject; looper : TCPlusObject) : TCplusObject; cdecl; external BePascalLibName name 'BInvoker_Create'; -function BInvoker_Create(AObject : TBeObject; message : TCplusObject; target : TCplusObject) : TCplusObject; cdecl; external BePascalLibName name 'BInvoker_Create'; +function BInvoker_Create(AObject : TBeObject; message : TCplusObject; handler : TCplusObject; looper : TCPlusObject) : TCplusObject; cdecl; external BePascalLibName name 'BInvoker_Create_1'; +function BInvoker_Create(AObject : TBeObject; message : TCplusObject; target : TCplusObject) : TCplusObject; cdecl; external BePascalLibName name 'BInvoker_Create_2'; procedure BInvoker_Free(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BInvoker_Free'; function BInvoker_SetMessage(AObject : TCPlusObject; message : TCplusObject) : TStatus_t; cdecl; external BePascalLibName name 'BInvoker_SetMessage'; function BInvoker_Message(AObject : TCPlusObject) : TCPlusObject; cdecl; external BePascalLibName name 'BInvoker_Message'; diff --git a/bepascal/bepascal/be/app/messenger.pp b/bepascal/bepascal/be/app/messenger.pp index 58d3d30..dcb399f 100644 --- a/bepascal/bepascal/be/app/messenger.pp +++ b/bepascal/bepascal/be/app/messenger.pp @@ -45,7 +45,7 @@ type // function operator==(other : TMessenger) : boolean; function IsValid : boolean; function Team : TTeam_id; - constructor Create(aTeam : TTeam_id; port : TPort_id; token : integer; preferred : boolean); +// constructor Create(aTeam : TTeam_id; port : TPort_id; token : integer; preferred : boolean); // procedure InitData(mime_sig : PChar; aTeam : TTeam_id; perr : PStatus_t); // procedure port_id fPort; // procedure int32 fHandlerToken; @@ -67,17 +67,17 @@ function BMessenger_IsTargetLocal(AObject : TCPlusObject) : boolean; cdecl; exte function BMessenger_Target(AObject : TCPlusObject; looper : TCplusObject) : THandler; cdecl; external BePascalLibName name 'BMessenger_Target'; function BMessenger_LockTarget(AObject : TCPlusObject) : boolean; cdecl; external BePascalLibName name 'BMessenger_LockTarget'; //function BMessenger_LockTargetWithTimeout(AObject : TCPlusObject; timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_LockTargetWithTimeout'; -function BMessenger_SendMessage(AObject : TCPlusObject; command : Cardinal; reply_to : THandler) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; -function BMessenger_SendMessage(AObject : TCPlusObject; a_message : TCplusObject; reply_to : TCplusObject; timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; +function BMessenger_SendMessage(AObject : TCPlusObject; command : Cardinal; reply_to : TCPlusObject) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; +function BMessenger_SendMessage_1(AObject : TCPlusObject; a_message : TCplusObject; reply_to : TCplusObject; timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage_1'; // How to handle this ? (remove the comment to see what to fix) -//function BMessenger_SendMessage(AObject : TCPlusObject; a_message : TCplusObject; reply_to : TCplusObject; timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; -function BMessenger_SendMessage(AObject : TCPlusObject; command : Cardinal; reply : TCplusObject) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; -function BMessenger_SendMessage(AObject : TCPlusObject; a_message : TCplusObject; reply : TCplusObject; send_timeout : TBigtime_t; reply_timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage'; +function BMessenger_SendMessage_2(AObject : TCPlusObject; a_message : TCplusObject; reply_to : TCplusObject; timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage_2'; +function BMessenger_SendMessage_3(AObject : TCPlusObject; command : Cardinal; reply : TCplusObject) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage_3'; +function BMessenger_SendMessage_4(AObject : TCPlusObject; a_message : TCplusObject; reply : TCplusObject; send_timeout : TBigtime_t; reply_timeout : TBigtime_t) : TStatus_t; cdecl; external BePascalLibName name 'BMessenger_SendMessage_4'; //function BMessenger_operator=(AObject : TCPlusObject; from : TMessenger) : TMessenger; cdecl; external BePascalLibName name 'BMessenger_operator='; //function BMessenger_operator==(AObject : TCPlusObject; other : TMessenger) : boolean; cdecl; external BePascalLibName name 'BMessenger_operator=='; function BMessenger_IsValid(AObject : TCPlusObject) : boolean; cdecl; external BePascalLibName name 'BMessenger_IsValid'; function BMessenger_Team(AObject : TCPlusObject) : TTeam_id; cdecl; external BePascalLibName name 'BMessenger_Team'; -function BMessenger_Create(AObject : TBeObject; team : TTeam_id; port : TPort_id; token : integer; preferred : boolean) : TCplusObject; cdecl; external BePascalLibName name 'BMessenger_Create'; +//function BMessenger_Create(AObject : TBeObject; team : TTeam_id; port : TPort_id; token : integer; preferred : boolean) : TCplusObject; cdecl; external BePascalLibName name 'BMessenger_Create'; //procedure BMessenger_InitData(AObject : TCPlusObject; mime_sig : PChar; team : TTeam_id; perr : PStatus_t); cdecl; external BePascalLibName name 'BMessenger_InitData'; //procedure BMessenger_port_id fPort(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMessenger_port_id fPort'; //procedure BMessenger_int32 fHandlerToken(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMessenger_int32 fHandlerToken'; @@ -143,22 +143,22 @@ end; function TMessenger.SendMessage(a_message : TMessage; reply_to : THandler; timeout : TBigtime_t) : TStatus_t; begin - Result := BMessenger_SendMessage(CPlusObject, a_message.CPlusObject, reply_to.CPlusObject, timeout); + Result := BMessenger_SendMessage_1(CPlusObject, a_message.CPlusObject, reply_to.CPlusObject, timeout); end; function TMessenger.SendMessage(a_message : TMessage; reply_to : TMessenger; timeout : TBigtime_t) : TStatus_t; begin - Result := BMessenger_SendMessage(CPlusObject, a_message.CPlusObject, reply_to.CPlusObject, timeout); + Result := BMessenger_SendMessage_2(CPlusObject, a_message.CPlusObject, reply_to.CPlusObject, timeout); end; function TMessenger.SendMessage(command : Cardinal; reply : TMessage) : TStatus_t; begin - Result := BMessenger_SendMessage(CPlusObject, command, reply.CPlusObject); + Result := BMessenger_SendMessage_3(CPlusObject, command, reply.CPlusObject); end; function TMessenger.SendMessage(a_message : TMessage; reply : TMessage; send_timeout : TBigtime_t; reply_timeout : TBigtime_t) : TStatus_t; begin - Result := BMessenger_SendMessage(CPlusObject, a_message.CPlusObject, reply.CPlusObject, send_timeout, reply_timeout); + Result := BMessenger_SendMessage_4(CPlusObject, a_message.CPlusObject, reply.CPlusObject, send_timeout, reply_timeout); end; //function TMessenger.operator=(from : TMessenger) : TMessenger; @@ -181,10 +181,10 @@ begin Result := BMessenger_Team(CPlusObject); end; -constructor TMessenger.Create(aTeam : TTeam_id; port : TPort_id; token : integer; preferred : boolean); -begin - CPlusObject := BMessenger_Create(Self, aTeam, port, token, preferred); -end; +//constructor TMessenger.Create(aTeam : TTeam_id; port : TPort_id; token : integer; preferred : boolean); +//begin +// CPlusObject := BMessenger_Create(Self, aTeam, port, token, preferred); +//end; //procedure TMessenger.InitData(mime_sig : PChar; aTeam : TTeam_id; perr : PStatus_t); //begin diff --git a/bepascal/bepascal/be/support/dataio.pp b/bepascal/bepascal/be/support/dataio.pp index 3e6a374..954fdc5 100644 --- a/bepascal/bepascal/be/support/dataio.pp +++ b/bepascal/bepascal/be/support/dataio.pp @@ -93,7 +93,7 @@ type { procedure _ReservedMallocIO1; procedure _ReservedMallocIO2; } - constructor Create(MallocIO : TMallocIO); +// constructor Create(MallocIO : TMallocIO); // function operator=( : TMallocIO) : TMallocIO; { function fBlockSize : TSize_t; function fMallocSize : TSize_t; @@ -185,7 +185,7 @@ function BMallocIO_Buffer(AObject : TCPlusObject) : Pointer; cdecl; external BeP {procedure BMallocIO__ReservedMallocIO1(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMallocIO__ReservedMallocIO1'; procedure BMallocIO__ReservedMallocIO2(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMallocIO__ReservedMallocIO2'; } -function BMallocIO_Create(AObject : TBeObject; MallocIO : TMallocIO) : TCPlusObject; cdecl; external BePascalLibName name 'BMallocIO_Create'; +//function BMallocIO_Create(AObject : TBeObject; MallocIO : TMallocIO) : TCPlusObject; cdecl; external BePascalLibName name 'BMallocIO_Create'; //function BMallocIO_operator=(AObject : TCPlusObject; MallocIO : TMallocIO) : TMallocIO; cdecl; external BePascalLibName name 'BMallocIO_operator='; {procedure BMallocIO_size_t fBlockSize(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMallocIO_size_t fBlockSize'; procedure BMallocIO_size_t fMallocSize(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMallocIO_size_t fMallocSize'; @@ -195,7 +195,7 @@ procedure BMallocIO_off_t fPosition(AObject : TCPlusObject); cdecl; external BeP procedure BMallocIO_int32 _reserved[1](AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMallocIO_int32 _reserved[1]'; } function BMemoryIO_Create(AObject : TBeObject) : TCPlusObject; cdecl; external BePascalLibName name 'BMemoryIO_Create'; -function BMemoryIO_Create(AObject : TBeObject; p : Pointer; len : TSize_t) : TCPlusObject; cdecl; external BePascalLibName name 'BMemoryIO_Create'; +function BMemoryIO_Create(AObject : TBeObject; p : Pointer; len : TSize_t) : TCPlusObject; cdecl; external BePascalLibName name 'BMemoryIO_Create_1'; procedure BMemoryIO_Free(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMemoryIO_Free'; function BMemoryIO_ReadAt(AObject : TCPlusObject; pos : Toff_t; buffer : Pointer; size : TSize_t) : TSSize_t; cdecl; external BePascalLibName name 'BMemoryIO_ReadAt'; function BMemoryIO_WriteAt(AObject : TCPlusObject; pos : Toff_t; buffer : Pointer; size : TSize_t) : TSSize_t; cdecl; external BePascalLibName name 'BMemoryIO_WriteAt'; @@ -488,10 +488,10 @@ begin end; } -constructor TMallocIO.Create(MallocIO : TMallocIO); -begin - CPlusObject := BMallocIO_Create(Self, MallocIO); -end; +//constructor TMallocIO.Create(MallocIO : TMallocIO); +//begin +// CPlusObject := BMallocIO_Create(Self, MallocIO); +//end; {function TMallocIO.operator=( : TMallocIO) : TMallocIO; begin