paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-23 07:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

* getinterface fixed

Browse Source
This commit is contained in:
florian 2005-04-28 17:58:18 +00:00
parent e9b8c080bf
commit 3a6006367f
1 changed files with 28 additions and 17 deletions

45
rtl/inc/objpas.inc
View File

@ -614,14 +614,18 @@
IEntry: pinterfaceentry;
begin
IEntry:=getinterfaceentry(iid);
if Assigned(IEntry) then begin
PPointer(@obj)^:=Pointer(Self)+IEntry^.IOffset;
getinterface:=True;
end
else begin
PPointer(@Obj)^:=nil;
getinterface:=False;
end;
if Assigned(IEntry) then
begin
Pointer(obj):=Pointer(Self)+IEntry^.IOffset;
if assigned(pointer(obj)) then
iinterface(obj)._AddRef;
getinterface:=True;
end
else
begin
PPointer(@Obj)^:=nil;
getinterface:=False;
end;
end;
function TObject.getinterfacebystr(const iidstr : string;out obj) : boolean;
@ -629,14 +633,18 @@
IEntry: pinterfaceentry;
begin
IEntry:=getinterfaceentrybystr(iidstr);
if Assigned(IEntry) then begin
PPointer(@obj)^:=Pointer(Self)+IEntry^.IOffset;
getinterfacebystr:=True;
end
else begin
PPointer(@Obj)^:=nil;
getinterfacebystr:=False;
end;
if Assigned(IEntry) then
begin
Pointer(obj):=Pointer(Self)+IEntry^.IOffset;
if assigned(pointer(obj)) then
iinterface(obj)._AddRef;
getinterfacebystr:=True;
end
else
begin
PPointer(@Obj)^:=nil;
getinterfacebystr:=False;
end;
end;
class function TObject.getinterfaceentry(const iid : tguid) : pinterfaceentry;
@ -758,7 +766,10 @@
{
$Log$
Revision 1.48 2005-04-05 21:05:31 peter
Revision 1.49 2005-04-28 17:58:18 florian
* getinterface fixed
Revision 1.48 2005/04/05 21:05:31 peter
* call initspecialchars if one of the specialchars is configured
for the first time