Some changes to PluginInterface to fit with 64 Bit Systems. lParam is maily for use as Pointer, therefore standardtype: Pointer. wParam should mainly be used for ordinals. (Integer or Int64 on 64Bit Systems).

Don't return addresses. Result is not assured to be Int64 on 64 Bit Systems.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@592 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 5 insertions, 5 deletions

diff --git a/Game/Code/Classes/UHooks.pas b/Game/Code/Classes/UHooks.pas
index c30803f7..3e22bc75 100644
--- a/Game/Code/Classes/UHooks.pas
+++ b/Game/Code/Classes/UHooks.pas
@@ -54,13 +54,13 @@ type
       Function AddSubscriber (const EventName: PChar; const Proc: TUS_Hook = nil; const ProcOfClass: TUS_Hook_of_Object = nil): THandle;
       Function DelSubscriber (const hSubscriber: THandle): Integer;
 
-      Function CallEventChain (const hEvent: THandle; const wParam, lParam: LongWord): Integer;
+      Function CallEventChain (const hEvent: THandle; const wParam: TwParam; lParam: TlParam): Integer;
       Function EventExists (const EventName: PChar): Integer;
 
       Procedure DelbyOwner(const Owner: Integer);
   end;
 
-function HookTest(wParam, lParam: DWord): integer; stdcall;
+function HookTest(wParam: TwParam; lParam: TlParam): integer; stdcall;
 
 var
   HookManager: THookManager;
@@ -318,7 +318,7 @@ end;
 // CallEventChain - Calls the Chain of a specified EventHandle
 // Returns: -1: Handle doesn't Exist, 0 Chain is called until the End
 //------------
-Function THookManager.CallEventChain (const hEvent: THandle; const wParam, lParam: LongWord): Integer;
+Function THookManager.CallEventChain (const hEvent: THandle; const wParam: TwParam; lParam: TlParam): Integer;
 var
   EventIndex: Cardinal;
   Cur: PSubscriberInfo;
@@ -421,10 +421,10 @@ begin
 end;
 
 
-function HookTest(wParam, lParam: DWord): integer; stdcall;
+function HookTest(wParam: TwParam; lParam: TlParam): integer; stdcall;
 begin
   Result := 0; //Don't break the chain
-  Core.ShowMessage(CORE_SM_INFO, Integer(PChar(String(PChar(Pointer(lParam))) + ': ' + String(PChar(Pointer(wParam))))));
+  Core.ShowMessage(CORE_SM_INFO, PChar(String(PChar(Pointer(lParam))) + ': ' + String(PChar(Pointer(wParam)))));
 end;
 
 end.