paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 02:09:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Reverse erronous commit of unchecked patch

Browse Source 
git-svn-id: trunk@20885 -
This commit is contained in:
michael 2012-04-15 14:02:16 +00:00
parent b2ce6b2cab
commit 3d366bca44
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/fcl-db/src/base/bufdataset.pas
View File

@ -36,20 +36,18 @@ type
FieldNo : integer;
OrgBufID: integer;
Buffer : pointer;
Size : PtrInt;
Size : ptrint;
end;
TBufBlobStream = class(TStream)
private
FBlobBuffer : PBlobBuffer;
FPosition : PtrInt;
FPosition : ptrint;
FDataset : TCustomBufDataset;
protected
function Read(var Buffer; Count: Longint): Longint; override;
function Write(const Buffer; Count: Longint): Longint; override;
function Seek(const Offset: int64; Origin: TSeekOrigin): int64; override;
function GetPosition: Int64; override;
function GetSize : Int64; override;
function Seek(Offset: Longint; Origin: Word): Longint; override;
public
constructor Create(Field: TBlobField; Mode: TBlobStreamMode);
end;
@ -2392,27 +2390,17 @@ begin
ABlobBuffer := Nil;
end;
function TBufBlobStream.Seek(const Offset: int64; Origin: TSeekOrigin): int64;
function TBufBlobStream.Seek(Offset: Longint; Origin: Word): Longint;
begin
Case Origin of
soBeginning : FPosition:=Offset;
soEnd : FPosition:=FBlobBuffer^.Size+Offset;
soCurrent : FpoSition:=FPosition+Offset;
soFromBeginning : FPosition:=Offset;
soFromEnd : FPosition:=FBlobBuffer^.Size+Offset;
soFromCurrent : FpoSition:=FPosition+Offset;
end;
Result:=FPosition;
end;
function TBufBlobStream.GetPosition: Int64;
begin
Result:=FPosition;
end;
function TBufBlobStream.GetSize: Int64;
begin
Result:=FBlobBuffer^.Size;
end;
function TBufBlobStream.Read(var Buffer; Count: Longint): Longint;

6
packages/fcl-db/src/base/datasource.inc
View File

@ -494,12 +494,8 @@ Procedure TMasterParamsDataLink.DoMasterDisable;
begin
Inherited;
if Assigned(Params) and Assigned(DetailDataset) and DetailDataset.Active then
begin
DetailDataSet.CheckBrowseMode;
If Assigned(DetailDataset) and DetailDataset.Active then
DetailDataset.Close;
DetailDataset.Open;
end;
end;
Procedure TMasterParamsDataLink.DoMasterChange;