* Patch to remove useless process_entry_hook from sven barth

git-svn-id: trunk@14094 -
This commit is contained in:
michael 2009-11-07 10:10:47 +00:00
parent cc8f91f2d0
commit 1cf64c032f
4 changed files with 0 additions and 23 deletions

View File

@ -28,8 +28,6 @@ Var
function Dll_entry{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}(const info : TEntryInformation){$endif FPC_HAS_INDIRECT_MAIN_INFORMATION} : longbool; [public,alias:'_FPC_DLL_Entry']; function Dll_entry{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}(const info : TEntryInformation){$endif FPC_HAS_INDIRECT_MAIN_INFORMATION} : longbool; [public,alias:'_FPC_DLL_Entry'];
var
res : longbool;
begin begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION} {$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
EntryInformation:=info; EntryInformation:=info;
@ -43,12 +41,6 @@ function Dll_entry{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}(const info : TEntry
MainThreadIdWin32 := Win32GetCurrentThreadId; MainThreadIdWin32 := Win32GetCurrentThreadId;
If SetJmp(DLLBuf) = 0 then If SetJmp(DLLBuf) = 0 then
begin begin
if assigned(Dll_Process_Attach_Hook) then
begin
res:=Dll_Process_Attach_Hook(DllParam);
if not res then
exit(false);
end;
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION} {$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
EntryInformation.PascalMain(); EntryInformation.PascalMain();
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION} {$else FPC_HAS_INDIRECT_MAIN_INFORMATION}

View File

@ -105,11 +105,9 @@ var
StartupConsoleMode : DWORD; StartupConsoleMode : DWORD;
type type
TDLL_Process_Entry_Hook = function (dllparam : longint) : longbool;
TDLL_Entry_Hook = procedure (dllparam : longint); TDLL_Entry_Hook = procedure (dllparam : longint);
const const
Dll_Process_Attach_Hook : TDLL_Process_Entry_Hook = nil;
Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;

View File

@ -98,11 +98,9 @@ var
cmdshow : longint; cmdshow : longint;
DLLreason,DLLparam:longint; DLLreason,DLLparam:longint;
type type
TDLL_Process_Entry_Hook = function (dllparam : longint) : longbool;
TDLL_Entry_Hook = procedure (dllparam : longint); TDLL_Entry_Hook = procedure (dllparam : longint);
const const
Dll_Process_Attach_Hook : TDLL_Process_Entry_Hook = nil;
Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;

View File

@ -67,11 +67,9 @@ var
DLLreason,DLLparam:DWord; DLLreason,DLLparam:DWord;
type type
TDLL_Process_Entry_Hook = function (dllparam : longint) : longbool;
TDLL_Entry_Hook = procedure (dllparam : longint); TDLL_Entry_Hook = procedure (dllparam : longint);
const const
Dll_Process_Attach_Hook : TDLL_Process_Entry_Hook = nil;
Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Process_Detach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil;
Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;
@ -855,21 +853,12 @@ Const
DLL_THREAD_DETACH = 3; DLL_THREAD_DETACH = 3;
function Dll_entry : longbool;[public, alias : '_FPC_DLL_Entry']; function Dll_entry : longbool;[public, alias : '_FPC_DLL_Entry'];
var
res : longbool;
begin begin
IsLibrary:=true; IsLibrary:=true;
Dll_entry:=false; Dll_entry:=false;
case DLLreason of case DLLreason of
DLL_PROCESS_ATTACH : DLL_PROCESS_ATTACH :
begin begin
if assigned(Dll_Process_Attach_Hook) then
begin
res:=Dll_Process_Attach_Hook(DllParam);
if not res then
exit(false);
end;
PASCALMAIN; PASCALMAIN;
Dll_entry:=true; Dll_entry:=true;
end; end;