[JVCL-Checkins] dev/JVCL3/run JvDBActions.pas,1.11,1.12 JvDBGridExport.pas,1.27,1.28 JvDBQueryParamsForm.pas,1.22,1.23 JvDynControlEngineJVCLDB.pas,1.7,1.8 - trying to secure finalization functions

[Robert M. <mar...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12229/JVCL3/run

Modified Files:
	JvDBActions.pas JvDBGridExport.pas JvDBQueryParamsForm.pas 
	JvDynControlEngineJVCLDB.pas 
Log Message:
trying to secure finalization functions


Index: JvDBQueryParamsForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBQueryParamsForm.pas,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JvDBQueryParamsForm.pas	9 Sep 2004 22:50:34 -0000	1.22
--- JvDBQueryParamsForm.pas	21 Jan 2005 15:46:46 -0000	1.23
***************
*** 79,82 ****
--- 79,90 ----
    FieldTypes: array [TFieldType] of string;
  
+ procedure ClearFieldTypes;
+ var
+   I: TFieldType;
+ begin
+   for I := Low(TFieldType) to High(TFieldType) do
+     FieldTypes[I] := '';
+ end;
+ 
  procedure FillFieldTypes;
  var
***************
*** 85,90 ****
    J: TFieldType;
  begin
!   for J := Low(TFieldType) to High(TFieldType) do
!     FieldTypes[J] := '';
    ParamString := RsDataTypes;
    J := Low(TFieldType);
--- 93,97 ----
    J: TFieldType;
  begin
!   ClearFieldTypes;
    ParamString := RsDataTypes;
    J := Low(TFieldType);
***************
*** 105,117 ****
  end;
  
- procedure ClearFieldTypes;
- var
-   I: TFieldType;
- begin
-   for I := Low(TFieldType) to High(TFieldType) do
-     //DisposeStr(FieldTypes[I]);
-     FieldTypes[I] := '';
- end;
- 
  procedure DoneQBind;
  begin
--- 112,115 ----
***************
*** 324,335 ****
    RegisterUnitVersion(HInstance, UnitVersioning);
    {$ENDIF UNITVERSIONING}
- 
    FillFieldTypes;
  
  finalization
    {$IFDEF UNITVERSIONING}
    UnregisterUnitVersion(HInstance);
    {$ENDIF UNITVERSIONING}
-   DoneQBind;
  
  end.
--- 322,332 ----
    RegisterUnitVersion(HInstance, UnitVersioning);
    {$ENDIF UNITVERSIONING}
    FillFieldTypes;
  
  finalization
+   DoneQBind;
    {$IFDEF UNITVERSIONING}
    UnregisterUnitVersion(HInstance);
    {$ENDIF UNITVERSIONING}
  
  end.

Index: JvDBGridExport.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBGridExport.pas,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** JvDBGridExport.pas	22 Dec 2004 09:59:29 -0000	1.27
--- JvDBGridExport.pas	21 Jan 2005 15:46:46 -0000	1.28
***************
*** 1231,1238 ****
    RegisterUnitVersion(HInstance, UnitVersioning);
    {$ENDIF UNITVERSIONING}
- 
    RegisterIntegerConsts(TypeInfo(TJvWordGridFormat), WordGridFormatIdentToInt, IntToWordGridFormatIdent);
  
- 
  {$IFDEF UNITVERSIONING}
  finalization
--- 1231,1236 ----

Index: JvDBActions.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBActions.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvDBActions.pas	21 Jan 2005 09:28:52 -0000	1.11
--- JvDBActions.pas	21 Jan 2005 15:46:46 -0000	1.12
***************
*** 1423,1426 ****
--- 1423,1427 ----
    begin
      TJvDatabaseActionBaseEngine(Items[I]).Free;
+     Items[I] := nil;
      Delete(I);
    end;

Index: JvDynControlEngineJVCLDB.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineJVCLDB.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvDynControlEngineJVCLDB.pas	21 Jan 2005 09:28:55 -0000	1.7
--- JvDynControlEngineJVCLDB.pas	21 Jan 2005 15:46:46 -0000	1.8
***************
*** 2057,2064 ****
  
  finalization
    {$IFDEF UNITVERSIONING}
    UnregisterUnitVersion(HInstance);
    {$ENDIF UNITVERSIONING}
-   FreeAndNil(IntDynControlEngineJVCLDB);
  
  end.
--- 2057,2064 ----
  
  finalization
+   FreeAndNil(IntDynControlEngineJVCLDB);
    {$IFDEF UNITVERSIONING}
    UnregisterUnitVersion(HInstance);
    {$ENDIF UNITVERSIONING}
  
  end.