paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-26 16:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fix dllscanner for win32

Browse Source 
git-svn-id: trunk@3449 -
This commit is contained in:
peter 2006-05-07 10:20:17 +00:00
parent 8581c2ee6f
commit 739c322f60
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/ogcoff.pas
View File

@ -214,7 +214,7 @@ interface
type type
Treaddllproc = procedure(const dllname,funcname:string); Treaddllproc = procedure(const dllname,funcname:string) of object;
function ReadDLLImports(const dllname:string;readdllproc:Treaddllproc):boolean; function ReadDLLImports(const dllname:string;readdllproc:Treaddllproc):boolean;

11
compiler/systems/t_win.pas
View File

@ -83,6 +83,10 @@ interface
end; end;
tDLLScannerWin32=class(tDLLScanner) tDLLScannerWin32=class(tDLLScanner)
private
importfound : boolean;
procedure CheckDLLFunc(const dllname,funcname:string);
public
function Scan(const binname:string):boolean;override; function Scan(const binname:string):boolean;override;
end; end;
@ -1621,7 +1625,7 @@ end;
TDLLScannerWin32 TDLLScannerWin32
****************************************************************************} ****************************************************************************}
procedure CheckDLLFunc(const dllname,funcname:string); procedure tDLLScannerWin32.CheckDLLFunc(const dllname,funcname:string);
var var
hp : tExternalsItem; hp : tExternalsItem;
begin begin
@ -1642,6 +1646,7 @@ end;
// timportlibwin32(importlib).importvariable_str(funcname,dllname,funcname) // timportlibwin32(importlib).importvariable_str(funcname,dllname,funcname)
// else // else
timportlibwin32(importlib).importprocedure_str(funcname,dllname,0,funcname); timportlibwin32(importlib).importprocedure_str(funcname,dllname,0,funcname);
importfound:=true;
exit; exit;
end; end;
hp:=tExternalsItem(hp.next); hp:=tExternalsItem(hp.next);
@ -1654,7 +1659,7 @@ end;
hs, hs,
dllname : string; dllname : string;
begin begin
result:=true; result:=false;
{ is there already an import library the we will use that one } { is there already an import library the we will use that one }
if FindLibraryFile(binname,target_info.staticClibprefix,target_info.staticClibext,hs) then if FindLibraryFile(binname,target_info.staticClibprefix,target_info.staticClibext,hs) then
exit; exit;
@ -1662,7 +1667,9 @@ end;
hs:=AddExtension(binname,target_info.sharedlibext); hs:=AddExtension(binname,target_info.sharedlibext);
if not FindDll(hs,dllname) then if not FindDll(hs,dllname) then
exit; exit;
importfound:=false;
ReadDLLImports(dllname,@CheckDLLFunc); ReadDLLImports(dllname,@CheckDLLFunc);
result:=importfound;
end; end;