marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented DelayLoadFailureHook and use it in the winebuild-generated 

delay load code.
oldstable
Alexandre Julliard 2005-08-12 16:00:42 +00:00
parent b49c12a91e
commit 646f17f249
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel/kernel32.spec
View File

@ -283,7 +283,7 @@
# @ stub DecodeSystemPointer ( -> ntdll.RtlDecodeSystemPointer)
@ stdcall DefineDosDeviceA(long str str)
@ stdcall DefineDosDeviceW(long wstr wstr)
@ stub DelayLoadFailureHook
@ stdcall DelayLoadFailureHook(str str)
@ stdcall DeleteAtom(long)
@ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection
@ stdcall DeleteFiber(ptr)

16
dlls/kernel/module.c
View File

@ -39,6 +39,7 @@
#include "module.h"
#include "kernel_private.h"
#include "wine/exception.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/server.h"
@ -967,3 +968,18 @@ FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function )
/* FIXME: we used to disable snoop when returning proc for Win16 subsystem */
return GetProcAddress( hModule, function );
}
/***********************************************************************
* DelayLoadFailureHook (KERNEL32.@)
*/
FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function )
{
ULONG_PTR args[2];
ERR( "failed to delay load %s.%s\n", name, function );
args[0] = (ULONG_PTR)name;
args[1] = (ULONG_PTR)function;
RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
return NULL;
}

21
tools/winebuild/import.c
View File

@ -36,7 +36,6 @@
#include "windef.h"
#include "winbase.h"
#include "wine/exception.h"
#include "build.h"
struct import
@ -526,7 +525,7 @@ static void add_extra_undef_symbols( const DLLSPEC *spec )
kernel_imports += add_extra_symbol( extras, &count, "LoadLibraryA", spec );
kernel_imports += add_extra_symbol( extras, &count, "FreeLibrary", spec );
kernel_imports += add_extra_symbol( extras, &count, "GetProcAddress", spec );
kernel_imports += add_extra_symbol( extras, &count, "RaiseException", spec );
kernel_imports += add_extra_symbol( extras, &count, "DelayLoadFailureHook", spec );
}
if (nb_stubs)
ntdll_imports += add_extra_symbol( extras, &count, "RtlRaiseException", spec );
@ -965,9 +964,9 @@ static int output_delayed_imports( FILE *outfile, const DLLSPEC *spec )
}
fprintf( outfile, " }\n};\n\n" );
fprintf( outfile, "extern void __stdcall RaiseException(unsigned int, unsigned int, unsigned int, const void *args[]);\n" );
fprintf( outfile, "extern void * __stdcall LoadLibraryA(const char*);\n");
fprintf( outfile, "extern void * __stdcall GetProcAddress(void *, const char*);\n");
fprintf( outfile, "extern void * __stdcall DelayLoadFailureHook(const char *, const char*);\n");
fprintf( outfile, "\n" );
fprintf( outfile, "void *__stdcall __wine_delay_load( int idx_nr )\n" );
@ -979,17 +978,11 @@ static int output_delayed_imports( FILE *outfile, const DLLSPEC *spec )
fprintf( outfile, " void *fn;\n\n" );
fprintf( outfile, " if (!*imd->phmod) *imd->phmod = LoadLibraryA(imd->szName);\n" );
fprintf( outfile, " if (*imd->phmod && (fn = GetProcAddress(*imd->phmod, *pINT)))\n");
fprintf( outfile, " /* patch IAT with final value */\n" );
fprintf( outfile, " return *pIAT = fn;\n" );
fprintf( outfile, " else {\n");
fprintf( outfile, " const void *args[2];\n" );
fprintf( outfile, " args[0] = imd->szName;\n" );
fprintf( outfile, " args[1] = *pINT;\n" );
fprintf( outfile, " RaiseException( 0x%08x, %d, 2, args );\n",
EXCEPTION_WINE_STUB, EH_NONCONTINUABLE );
fprintf( outfile, " return 0;\n" );
fprintf( outfile, " }\n}\n" );
fprintf( outfile, " if (!*imd->phmod || !(fn = GetProcAddress(*imd->phmod, *pINT)))\n");
fprintf( outfile, " fn = DelayLoadFailureHook(imd->szName, *pINT);\n" );
fprintf( outfile, " /* patch IAT with final value */\n" );
fprintf( outfile, " return *pIAT = fn;\n" );
fprintf( outfile, "}\n" );
return nb_delayed;
}