ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/runtime/IBEvents.pas

Comparing ibx/trunk/runtime/IBEvents.pas (file contents):
Revision 1 by tony, Mon Jul 31 16:43:00 2000 UTC vs.
Revision 33 by tony, Sat Jul 18 12:30:52 2015 UTC

#	Line 24 | Line 24
24		{       Corporation. All Rights Reserved.                                }
25		{    Contributor(s): Jeff Overcash                                       }
26		{                                                                        }
27	+	{    IBX For Lazarus (Firebird Express)                                  }
28	+	{    Contributor: Tony Whyman, MWA Software http://www.mwasoftware.co.uk }
29	+	{    Portions created by MWA Software are copyright McCallum Whyman      }
30	+	{    Associates Ltd 2011                                                 }
31	+	{                                                                        }
32		{************************************************************************}
33
34	+	{
35	+	This unit has been almost completely re-written as the original code was
36	+	not that robust - and I am not even sure if it worked. The IBPP C++ implementation
37	+	was used for guidance and inspiration. A permanent thread is used to receive
38	+	events from the asynchronous event handler. This then uses "Synchronize" to
39	+	process the event in the main thread.
40	+
41	+	Note that an error will occur if the TIBEvent's Registered property is set to
42	+	true before the Database has been opened.
43	+	}
44	+
45		unit IBEvents;
46
47	+	{$Mode Delphi}
48	+
49		interface
50
51		uses
52	<	SysUtils, Windows, Messages, Classes, Graphics, Controls,
53	<	Forms, Dialogs, DB, IBHeader, IBExternals, IB, IBDatabase;
52	>	{$IFDEF WINDOWS }
53	>	Windows,
54	>	{$ELSE}
55	>	unix,
56	>	{$ENDIF}
57	>	Classes, IBHeader, IBExternals, IB, IBDatabase;
58
59		const
60		MaxEvents = 15;
39	–	EventLength = 64;
61
62		type
63
64		TEventAlert = procedure( Sender: TObject; EventName: string; EventCount: longint;
65		var CancelAlerts: Boolean) of object;
66
67	<	TEventBuffer = array[ 0..MaxEvents-1, 0..EventLength-1] of char;
67	>	{ TIBEvents }
68
69		TIBEvents = class(TComponent)
70		private
71		FIBLoaded: Boolean;
72	+	FBase: TIBBase;
73		FEvents: TStrings;
74		FOnEventAlert: TEventAlert;
75	<	FQueued: Boolean;
76	<	FRegistered: Boolean;
77	<	Buffer: TEventBuffer;
78	<	Changing: Boolean;
79	<	CS: TRTLCriticalSection;
80	<	EventBuffer: PChar;
59	<	EventBufferLen: integer;
60	<	EventID: ISC_LONG;
61	<	ProcessingEvents: Boolean;
62	<	RegisteredState: Boolean;
63	<	ResultBuffer: PChar;
64	<	FDatabase: TIBDatabase;
75	>	FEventHandler: TObject;
76	>	FRegistered: boolean;
77	>	FDeferredRegister: boolean;
78	>	procedure EventChange(sender: TObject);
79	>	function GetDatabase: TIBDatabase;
80	>	function GetDatabaseHandle: TISC_DB_HANDLE;
81		procedure SetDatabase( value: TIBDatabase);
82		procedure ValidateDatabase( Database: TIBDatabase);
83	<	procedure DoQueueEvents;
84	<	procedure EventChange( sender: TObject);
69	<	procedure UpdateResultBuffer( length: short; updated: PChar);
83	>	procedure DoBeforeDatabaseDisconnect(Sender: TObject);
84	>	procedure DoAfterDatabaseConnect(Sender: TObject);
85		protected
71	–	procedure HandleEvent;
72	–	procedure Loaded; override;
86		procedure Notification( AComponent: TComponent; Operation: TOperation); override;
87		procedure SetEvents( value: TStrings);
88		procedure SetRegistered( value: boolean);
76	–	function  GetNativeHandle: TISC_DB_HANDLE;
89
90		public
91		constructor Create( AOwner: TComponent); override;
92		destructor Destroy; override;
81	–	procedure CancelEvents;
82	–	procedure QueueEvents;
93		procedure RegisterEvents;
94		procedure UnRegisterEvents;
95	<	property  Queued: Boolean read FQueued;
95	>	property DatabaseHandle: TISC_DB_HANDLE read GetDatabaseHandle;
96	>	property DeferredRegister: boolean read FDeferredRegister write FDeferredRegister;
97		published
98	<	property  Database: TIBDatabase read FDatabase write SetDatabase;
98	>	property Database: TIBDatabase read GetDatabase write SetDatabase;
99		property Events: TStrings read FEvents write SetEvents;
100		property Registered: Boolean read FRegistered write SetRegistered;
101		property OnEventAlert: TEventAlert read FOnEventAlert write FOnEventAlert;
102		end;
103
104	+
105		implementation
106
107		uses
108	<	IBIntf;
108	>	IBIntf, syncobjs, SysUtils;
109	>
110	>	type
111	>
112	>	TEventHandlerStates = (
113	>	stIdle,           {Events not monitored}
114	>	stHasEvb,         {Event Block Allocated but not queued}
115	>	stQueued,         {Waiting for Event}
116	>	stSignalled       {Event Callback signalled Event}
117	>	);
118	>
119	>	{ TEventHandler }
120	>
121	>	TEventHandler = class(TThread)
122	>	private
123	>	FOwner: TIBEvents;
124	>	FCriticalSection: TCriticalSection;   {protects race conditions in stQueued state}
125	>	{$IFDEF WINDOWS}
126	>	{Make direct use of Windows API as TEventObject don't seem to work under
127	>	Windows!}
128	>	FEventHandler: THandle;
129	>	{$ELSE}
130	>	FEventWaiting: TEventObject;
131	>	{$ENDIF}
132	>	FState: TEventHandlerStates;
133	>	FEventBuffer: PChar;
134	>	FEventBufferLen: integer;
135	>	FEventID: ISC_LONG;
136	>	FRegisteredState: Boolean;
137	>	FResultBuffer: PChar;
138	>	FEvents: TStringList;
139	>	FSignalFired: boolean;
140	>	procedure QueueEvents;
141	>	procedure CancelEvents;
142	>	procedure HandleEventSignalled(length: short; updated: PChar);
143	>	procedure DoEventSignalled;
144	>	protected
145	>	procedure Execute; override;
146	>	public
147	>	constructor Create(Owner: TIBEvents);
148	>	destructor Destroy; override;
149	>	procedure Terminate;
150	>	procedure RegisterEvents(Events: TStrings);
151	>	procedure UnregisterEvents;
152	>	end;
153	>
154	>	{This procedure is used for the event call back - note the cdecl }
155
156	<	function TIBEvents.GetNativeHandle: TISC_DB_HANDLE;
156	>	procedure IBEventCallback( ptr: pointer; length: short; updated: PChar); cdecl;
157		begin
158	<	if assigned( FDatabase) and FDatabase.Connected then
159	<	Result := FDatabase.Handle
160	<	else result := nil;
158	>	if (ptr = nil) or (length = 0) or (updated = nil) then
159	>	Exit;
160	>	{ Handle events asynchronously in second thread }
161	>	TEventHandler(ptr).HandleEventSignalled(length,updated);
162		end;
163
164	<	procedure TIBEvents.ValidateDatabase( Database: TIBDatabase);
164	>
165	>
166	>	{ TEventHandler }
167	>
168	>	procedure TEventHandler.QueueEvents;
169	>	var
170	>	callback: pointer;
171	>	DBH: TISC_DB_HANDLE;
172		begin
173	<	if not assigned( Database) then
174	<	IBError(ibxeDatabaseNameMissing, [nil]);
175	<	if not Database.Connected then
176	<	IBError(ibxeDatabaseClosed, [nil]);
173	>	if FState <> stHasEvb then
174	>	Exit;
175	>	FCriticalSection.Enter;
176	>	try
177	>	callback := @IBEventCallback;
178	>	DBH := FOwner.DatabaseHandle;
179	>	if (isc_que_events( StatusVector, @DBH, @FEventID, FEventBufferLen,
180	>	FEventBuffer, TISC_CALLBACK(callback), PVoid(Self)) <> 0) then
181	>	IBDatabaseError;
182	>	FState := stQueued
183	>	finally
184	>	FCriticalSection.Leave
185	>	end;
186		end;
187
188	<	{ TIBEvents }
188	>	procedure TEventHandler.CancelEvents;
189	>	var
190	>	DBH: TISC_DB_HANDLE;
191	>	begin
192	>	if FState in [stQueued,stSignalled] then
193	>	begin
194	>	FCriticalSection.Enter;
195	>	try
196	>	DBH := FOwner.DatabaseHandle;
197	>	if (isc_Cancel_events( StatusVector, @DBH, @FEventID) <> 0) then
198	>	IBDatabaseError;
199	>	FState := stHasEvb;
200	>	finally
201	>	FCriticalSection.Leave
202	>	end;
203	>	end;
204	>
205	>	if FState = stHasEvb then
206	>	begin
207	>	isc_free( FEventBuffer);
208	>	FEventBuffer := nil;
209	>	isc_free( FResultBuffer);
210	>	FResultBuffer := nil;
211	>	FState := stIdle
212	>	end;
213	>	FSignalFired := false
214	>	end;
215
216	<	procedure HandleEvent( param: integer); stdcall;
216	>	procedure TEventHandler.HandleEventSignalled(length: short; updated: PChar);
217		begin
218	<	{ don't let exceptions propogate out of thread }
218	>	FCriticalSection.Enter;
219		try
220	<	TIBEvents( param).HandleEvent;
221	<	except
222	<	Application.HandleException( nil);
220	>	if FState <> stQueued then
221	>	Exit;
222	>	Move(Updated[0], FResultBuffer[0], Length);
223	>	FState := stSignalled;
224	>	{$IFDEF WINDOWS}
225	>	SetEVent(FEventHandler);
226	>	{$ELSE}
227	>	FEventWaiting.SetEvent;
228	>	{$ENDIF}
229	>	finally
230	>	FCriticalSection.Leave
231		end;
232		end;
233
234	<	procedure IBEventCallback( ptr: pointer; length: short; updated: PChar); cdecl;
234	>	procedure TEventHandler.DoEventSignalled;
235		var
236	<	ThreadID: DWORD;
236	>	i: integer;
237	>	CancelAlerts: boolean;
238	>	Status: array[0..19] of ISC_LONG; {Note in 64 implementation the ibase.h implementation
239	>	is different from Interbase 6.0 API documentatoin}
240	>	begin
241	>	if FState <> stSignalled then
242	>	Exit;
243	>	isc_event_counts( @Status, FEventBufferLen, FEventBuffer, FResultBuffer);
244	>	CancelAlerts := false;
245	>	if not FSignalFired then
246	>	FSignalFired := true   {Ignore first time}
247	>	else
248	>	if assigned(FOwner.FOnEventAlert)  then
249	>	begin
250	>	for i := 0 to FEvents.Count - 1 do
251	>	begin
252	>	try
253	>	if (Status[i] <> 0) and not CancelAlerts then
254	>	FOwner.FOnEventAlert( self, FEvents[i], Status[i], CancelAlerts);
255	>	except
256	>	FOwner.FBase.HandleException(Self)
257	>	end;
258	>	end;
259	>	end;
260	>	FState := stHasEvb;
261	>	if  CancelAlerts then
262	>	CancelEvents
263	>	else
264	>	QueueEvents
265	>	end;
266	>
267	>	procedure TEventHandler.Execute;
268		begin
269	<	{ Handle events asynchronously in second thread }
270	<	EnterCriticalSection( TIBEvents( ptr).CS);
271	<	TIBEvents( ptr).UpdateResultBuffer( length, updated);
272	<	if TIBEvents( ptr).Queued then
273	<	CloseHandle( CreateThread( nil, 8192, @HandleEvent, ptr, 0, ThreadID));
274	<	LeaveCriticalSection( TIBEvents( ptr).CS);
269	>	while not Terminated do
270	>	begin
271	>	{$IFDEF WINDOWS}
272	>	WaitForSingleObject(FEventHandler,INFINITE);
273	>	{$ELSE}
274	>	FEventWaiting.WaitFor(INFINITE);
275	>	{$ENDIF}
276	>
277	>	if not Terminated and (FState = stSignalled) then
278	>	Synchronize(DoEventSignalled)
279	>	end;
280	>	end;
281	>
282	>
283	>
284	>	constructor TEventHandler.Create(Owner: TIBEvents);
285	>	var
286	>	PSa : PSecurityAttributes;
287	>	{$IFDEF WINDOWS}
288	>	Sd : TSecurityDescriptor;
289	>	Sa : TSecurityAttributes;
290	>	begin
291	>	InitializeSecurityDescriptor(@Sd,SECURITY_DESCRIPTOR_REVISION);
292	>	SetSecurityDescriptorDacl(@Sd,true,nil,false);
293	>	Sa.nLength := SizeOf(Sa);
294	>	Sa.lpSecurityDescriptor := @Sd;
295	>	Sa.bInheritHandle := true;
296	>	PSa := @Sa;
297	>	{$ELSE}
298	>	begin
299	>	PSa:= nil;
300	>	{$ENDIF}
301	>	inherited Create(true);
302	>	FOwner := Owner;
303	>	FState := stIdle;
304	>	FCriticalSection := TCriticalSection.Create;
305	>	{$IFDEF WINDOWS}
306	>	FEventHandler := CreateEvent(PSa,false,true,nil);
307	>	{$ELSE}
308	>	FEventWaiting := TEventObject.Create(PSa,false,true,FOwner.Name+'.Events');
309	>	{$ENDIF}
310	>	FEvents := TStringList.Create;
311	>	FreeOnTerminate := true;
312	>	Resume
313	>	end;
314	>
315	>	destructor TEventHandler.Destroy;
316	>	begin
317	>	if assigned(FCriticalSection) then FCriticalSection.Free;
318	>	{$IFDEF WINDOWS}
319	>	CloseHandle(FEventHandler);
320	>	{$ELSE}
321	>	if assigned(FEventWaiting) then FEventWaiting.Free;
322	>	{$ENDIF}
323	>	if assigned(FEvents) then FEvents.Free;
324	>	inherited Destroy;
325	>	end;
326	>
327	>	procedure TEventHandler.Terminate;
328	>	begin
329	>	inherited Terminate;
330	>	{$IFDEF WINDOWS}
331	>	SetEvent(FEventHandler);
332	>	{$ELSE}
333	>	FEventWaiting.SetEvent;
334	>	{$ENDIF}
335	>	CancelEvents;
336	>	end;
337	>
338	>	procedure TEventHandler.RegisterEvents(Events: TStrings);
339	>	var
340	>	i: integer;
341	>	EventNames: array of PChar;
342	>	begin
343	>	UnregisterEvents;
344	>
345	>	if Events.Count = 0 then
346	>	exit;
347	>
348	>	setlength(EventNames,MaxEvents);
349	>	try
350	>	for i := 0 to Events.Count-1 do
351	>	EventNames[i] := PChar(Events[i]);
352	>	FEvents.Assign(Events);
353	>	FEventBufferlen := isc_event_block(@FEventBuffer,@FResultBuffer,
354	>	Events.Count,
355	>	EventNames[0],EventNames[1],EventNames[2],
356	>	EventNames[3],EventNames[4],EventNames[5],
357	>	EventNames[6],EventNames[7],EventNames[8],
358	>	EventNames[9],EventNames[10],EventNames[11],
359	>	EventNames[12],EventNames[13],EventNames[14]
360	>	);
361	>	FState := stHasEvb;
362	>	FRegisteredState := true;
363	>	QueueEvents
364	>	finally
365	>	SetLength(EventNames,0)
366	>	end;
367	>	end;
368	>
369	>	procedure TEventHandler.UnregisterEvents;
370	>	begin
371	>	if FRegisteredState then
372	>	begin
373	>	CancelEvents;
374	>	FRegisteredState := false;
375	>	end;
376	>	end;
377	>
378	>	{ TIBEvents }
379	>
380	>	procedure TIBEvents.ValidateDatabase( Database: TIBDatabase);
381	>	begin
382	>	if not assigned( Database) then
383	>	IBError(ibxeDatabaseNameMissing, [nil]);
384	>	if not Database.Connected then
385	>	IBError(ibxeDatabaseClosed, [nil]);
386		end;
387
388		constructor TIBEvents.Create( AOwner: TComponent);
#	Line 140 | Line 391 | begin
391		FIBLoaded := False;
392		CheckIBLoaded;
393		FIBLoaded := True;
394	<	InitializeCriticalSection( CS);
394	>	FBase := TIBBase.Create(Self);
395	>	FBase.BeforeDatabaseDisconnect := DoBeforeDatabaseDisconnect;
396	>	FBase.AfterDatabaseConnect := DoAfterDatabaseConnect;
397		FEvents := TStringList.Create;
398		with TStringList( FEvents) do
399		begin
400		OnChange := EventChange;
401		Duplicates := dupIgnore;
402		end;
403	+	FEventHandler := TEventHandler.Create(self)
404		end;
405
406		destructor TIBEvents.Destroy;
#	Line 154 | Line 408 | begin
408		if FIBLoaded then
409		begin
410		UnregisterEvents;
411	<	SetDatabase( nil);
411	>	SetDatabase(nil);
412		TStringList(FEvents).OnChange := nil;
413	+	FBase.Free;
414		FEvents.Free;
160	–	DeleteCriticalSection( CS);
415		end;
416	+	if assigned(FEventHandler) then
417	+	TEventHandler(FEventHandler).Terminate;
418	+	FEventHandler := nil;
419		inherited Destroy;
420		end;
421
165	–	procedure TIBEvents.CancelEvents;
166	–	begin
167	–	if ProcessingEvents then
168	–	IBError(ibxeInvalidCancellation, [nil]);
169	–	if FQueued then
170	–	begin
171	–	try
172	–	{ wait for event handler to finish before cancelling events }
173	–	EnterCriticalSection( CS);
174	–	ValidateDatabase( Database);
175	–	FQueued := false;
176	–	Changing := true;
177	–	if (isc_Cancel_events( StatusVector, @FDatabase.Handle, @EventID) > 0) then
178	–	IBDatabaseError;
179	–	finally
180	–	LeaveCriticalSection( CS);
181	–	end;
182	–	end;
183	–	end;
422
185	–	procedure TIBEvents.DoQueueEvents;
186	–	var
187	–	callback: pointer;
188	–	begin
189	–	ValidateDatabase( DataBase);
190	–	callback := @IBEventCallback;
191	–	if (isc_que_events( StatusVector, @FDatabase.Handle, @EventID, EventBufferLen,
192	–	EventBuffer, TISC_CALLBACK(callback), PVoid(Self)) > 0) then
193	–	IBDatabaseError;
194	–	FQueued := true;
195	–	end;
423
424		procedure TIBEvents.EventChange( sender: TObject);
425		begin
#	Line 207 | Line 434 | begin
434		TStringList(Events).OnChange := EventChange;
435		IBError(ibxeMaximumEvents, [nil]);
436		end;
437	<	if Registered then RegisterEvents;
438	<	end;
212	<
213	<	procedure TIBEvents.HandleEvent;
214	<	var
215	<	Status: PStatusVector;
216	<	CancelAlerts: Boolean;
217	<	i: integer;
218	<	begin
219	<	try
220	<	{ prevent modification of vital data structures while handling events }
221	<	EnterCriticalSection( CS);
222	<	ProcessingEvents := true;
223	<	isc_event_counts( StatusVector, EventBufferLen, EventBuffer, ResultBuffer);
224	<	CancelAlerts := false;
225	<	if assigned(FOnEventAlert) and not Changing then
226	<	begin
227	<	for i := 0 to Events.Count-1 do
228	<	begin
229	<	try
230	<	Status := StatusVectorArray;
231	<	if (Status[i] <> 0) and not CancelAlerts then
232	<	FOnEventAlert( self, Events[Events.Count-i-1], Status[i], CancelAlerts);
233	<	except
234	<	Application.HandleException( nil);
235	<	end;
236	<	end;
237	<	end;
238	<	Changing := false;
239	<	if not CancelAlerts and FQueued then DoQueueEvents;
240	<	finally
241	<	ProcessingEvents := false;
242	<	LeaveCriticalSection( CS);
243	<	end;
244	<	end;
245	<
246	<	procedure TIBEvents.Loaded;
247	<	begin
248	<	inherited Loaded;
249	<	try
250	<	if RegisteredState then RegisterEvents;
251	<	except
252	<	if csDesigning in ComponentState then
253	<	Application.HandleException( self)
254	<	else raise;
255	<	end;
437	>	if Registered then
438	>	TEventHandler(FEventHandler).RegisterEvents(Events);
439		end;
440
441		procedure TIBEvents.Notification( AComponent: TComponent;
442		Operation: TOperation);
443		begin
444		inherited Notification( AComponent, Operation);
445	<	if (Operation = opRemove) and (AComponent = FDatabase) then
445	>	if (Operation = opRemove) and (AComponent = FBase.Database) then
446		begin
447		UnregisterEvents;
448	<	FDatabase := nil;
266	<	end;
267	<	end;
268	<
269	<	procedure TIBEvents.QueueEvents;
270	<	begin
271	<	if not FRegistered then
272	<	IBError(ibxeNoEventsRegistered, [nil]);
273	<	if ProcessingEvents then
274	<	IBError(ibxeInvalidQueueing, [nil]);
275	<	if not FQueued then
276	<	begin
277	<	try
278	<	{ wait until current event handler is finished before queuing events }
279	<	EnterCriticalSection( CS);
280	<	DoQueueEvents;
281	<	Changing := true;
282	<	finally
283	<	LeaveCriticalSection( CS);
284	<	end;
448	>	FBase.Database := nil;
449		end;
450		end;
451
452		procedure TIBEvents.RegisterEvents;
289	–	var
290	–	i: integer;
291	–	bufptr: pointer;
292	–	eventbufptr: pointer;
293	–	resultbufptr: pointer;
294	–	buflen: integer;
453		begin
454		ValidateDatabase( Database);
455		if csDesigning in ComponentState then FRegistered := true
456	<	else begin
457	<	UnregisterEvents;
458	<	if Events.Count = 0 then exit;
459	<	for i := 0 to Events.Count-1 do
460	<	StrPCopy( @Buffer[i][0], Events[i]);
461	<	i := Events.Count;
462	<	bufptr := @buffer[0];
463	<	eventbufptr :=  @EventBuffer;
306	<	resultBufPtr := @ResultBuffer;
307	<	asm
308	<	mov ecx, dword ptr [i]
309	<	mov eax, dword ptr [bufptr]
310	<	@@1:
311	<	push eax
312	<	add  eax, EventLength
313	<	loop @@1
314	<	push dword ptr [i]
315	<	push dword ptr [resultBufPtr]
316	<	push dword ptr [eventBufPtr]
317	<	call [isc_event_block]
318	<	mov  dword ptr [bufLen], eax
319	<	mov eax, dword ptr [i]
320	<	shl eax, 2
321	<	add eax, 12
322	<	add esp, eax
456	>	else
457	>	begin
458	>	if not FBase.Database.Connected then
459	>	FDeferredRegister := true
460	>	else
461	>	begin
462	>	TEventHandler(FEventHandler).RegisterEvents(Events);
463	>	FRegistered := true;
464		end;
324	–	EventBufferlen := Buflen;
325	–	FRegistered := true;
326	–	QueueEvents;
465		end;
466		end;
467
#	Line 334 | Line 472 | end;
472
473		procedure TIBEvents.SetDatabase( value: TIBDatabase);
474		begin
475	<	if value <> FDatabase then
475	>	if value <> FBase.Database then
476		begin
477	<	UnregisterEvents;
477	>	if Registered then UnregisterEvents;
478		if assigned( value) and value.Connected then ValidateDatabase( value);
479	<	FDatabase := value;
479	>	FBase.Database := value;
480	>	if (FBase.Database <> nil) and FBase.Database.Connected then
481	>	DoAfterDatabaseConnect(FBase.Database)
482		end;
483		end;
484
485	+	function TIBEvents.GetDatabase: TIBDatabase;
486	+	begin
487	+	Result := FBase.Database
488	+	end;
489	+
490		procedure TIBEvents.SetRegistered( value: Boolean);
491		begin
492	<	if (csReading in ComponentState) then
493	<	RegisteredState := value
494	<	else if FRegistered <> value then
495	<	if value then RegisterEvents else UnregisterEvents;
492	>	FDeferredRegister := false;
493	>	if not assigned(FBase) or (FBase.Database = nil) then
494	>	begin
495	>	FDeferredRegister := value;
496	>	Exit;
497	>	end;
498	>
499	>	if value then RegisterEvents else UnregisterEvents;
500		end;
501
502		procedure TIBEvents.UnregisterEvents;
503		begin
504	<	if ProcessingEvents then
505	<	IBError(ibxeInvalidRegistration, [nil]);
504	>	FDeferredRegister := false;
505	>	if not FRegistered then
506	>	Exit;
507		if csDesigning in ComponentState then
508		FRegistered := false
509	<	else if not (csLoading in ComponentState) then
509	>	else
510		begin
511	<	CancelEvents;
362	<	if FRegistered then
363	<	begin
364	<	isc_free( EventBuffer);
365	<	EventBuffer := nil;
366	<	isc_free( ResultBuffer);
367	<	ResultBuffer := nil;
368	<	end;
511	>	TEventHandler(FEventHandler).UnRegisterEvents;
512		FRegistered := false;
513		end;
514		end;
515
516	<	procedure TIBEvents.UpdateResultBuffer( length: short; updated: PChar);
517	<	var
518	<	i: integer;
516	>	procedure TIBEvents.DoBeforeDatabaseDisconnect(Sender: TObject);
517	>	begin
518	>	UnregisterEvents;
519	>	end;
520	>
521	>	procedure TIBEvents.DoAfterDatabaseConnect(Sender: TObject);
522		begin
523	<	for i := 0 to length-1 do
524	<	ResultBuffer[i] := updated[i];
523	>	if FDeferredRegister then
524	>	Registered := true
525		end;
526
527	+	function TIBEvents.GetDatabaseHandle: TISC_DB_HANDLE;
528	+	begin
529	+	ValidateDatabase(FBase.Database);
530	+	Result := FBase.Database.Handle;
531	+	end;
532	+
533	+
534		end.

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines