paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-07-30 08:26:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed bug #0025117

Browse Source 
git-svn-id: trunk@25610 -
This commit is contained in:
michael 2013-09-30 13:23:01 +00:00
parent bb00c76fe7
commit 5799ff1789
1 changed files with 496 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/oracle/src/oci.inc
View File

@ -3378,7 +3378,7 @@ uses ctypes,
{$include ociap.inc} {$include ociap.inc}
{$IFDEF LinkDynamically} {$IFDEF LinkDynamically}
Procedure InitialiseOCI; Procedure InitialiseOCI(LibraryName: AnsiString = ocilib);
Procedure ReleaseOCI; Procedure ReleaseOCI;
var OCILibraryHandle : TLibHandle; var OCILibraryHandle : TLibHandle;
@ -3390,20 +3390,31 @@ implementation
{$IFDEF LinkDynamically} {$IFDEF LinkDynamically}
var RefCount : integer; var
RefCount : integer;
LibName : AnsiString;
Procedure InitialiseOCI; Procedure InitialiseOCI(LibraryName: AnsiString = ocilib);
begin begin
inc(RefCount); inc(RefCount);
if RefCount = 1 then if RefCount > 1 then
begin
if CompareText(LibName,LibraryName)<>0 then
Raise EInOutError.CreateFmt('Can not load Oracle client library "%s". it is already loaded as "%s".',[LibraryName,LibName]);
exit;
end
else
begin begin
OCILibraryHandle:=loadlibrary(ocilib); OCILibraryHandle:=loadlibrary(ocilib);
if (OCILibraryHandle=nilhandle) then if (OCILibraryHandle=nilhandle) then
begin begin
RefCount := 0; RefCount := 0;
Raise EInOutError.Create('Can not load Oracle client. Is it installed? ('+ocilib+')'); Raise EInOutError.CreateFmt('Can not load Oracle client library "%s". Is it installed?',[LibraryName]);
end; end;
libName:=LibraryName;
end;
{ ORL.inc} { ORL.inc}
pointer(OCINumberInc) := GetProcedureAddress(OCILibraryHandle,'OCINumberInc'); pointer(OCINumberInc) := GetProcedureAddress(OCILibraryHandle,'OCINumberInc');
pointer(OCINumberDec) := GetProcedureAddress(OCILibraryHandle,'OCINumberDec'); pointer(OCINumberDec) := GetProcedureAddress(OCILibraryHandle,'OCINumberDec');
@ -3890,17 +3901,18 @@ begin
pointer(OCIDBShutdown) := GetProcedureAddress(OCILibraryHandle,'OCIDBShutdown'); pointer(OCIDBShutdown) := GetProcedureAddress(OCILibraryHandle,'OCIDBShutdown');
pointer(OCIClientVersion) := GetProcedureAddress(OCILibraryHandle,'OCIClientVersion'); pointer(OCIClientVersion) := GetProcedureAddress(OCILibraryHandle,'OCIClientVersion');
pointer(OCIInitEventHandle) := GetProcedureAddress(OCILibraryHandle,'OCIInitEventHandle'); pointer(OCIInitEventHandle) := GetProcedureAddress(OCILibraryHandle,'OCIInitEventHandle');
end;
end; end;
Procedure ReleaseOCI; Procedure ReleaseOCI;
begin begin
if RefCount > 0 then dec(RefCount); if RefCount > 0 then
dec(RefCount);
if RefCount = 0 then if RefCount = 0 then
begin begin
if not UnloadLibrary(OCILibraryHandle) then inc(RefCount); if not UnloadLibrary(OCILibraryHandle) then
inc(RefCount);
LibName:='';
end; end;
end; end;