Skip to content

W
wine-cw
Commit d4098549 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved the delay loading support code to the winecrt0 library.

parent 774e6d28
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 53 deletions
dlls/winecrt0/Makefile.in
View file @ d4098549
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = libwinecrt0.a
C_SRCS = \
delay_load.c \
dll_main.c \
exe_main.c \
exe_wmain.c \
......
dlls/winecrt0/delay_load.c 0 → 100644
View file @ d4098549
/*
* Support for delayed imports
*
* Copyright 2005 Alexandre Julliard
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
struct ImgDelayDescr
{
DWORD grAttrs;
LPCSTR szName;
HMODULE *phmod;
IMAGE_THUNK_DATA *pIAT;
const IMAGE_THUNK_DATA *pINT;
const IMAGE_THUNK_DATA *pBoundIAT;
const IMAGE_THUNK_DATA *pUnloadIAT;
DWORD dwTimeStamp;
};
extern struct ImgDelayDescr __wine_spec_delay_imports[];
extern FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function );
FARPROC WINAPI __wine_spec_delay_load( unsigned int id )
{
struct ImgDelayDescr *descr = __wine_spec_delay_imports + HIWORD(id);
WORD func = LOWORD(id);
FARPROC proc;
if (!*descr->phmod) *descr->phmod = LoadLibraryA( descr->szName );
if (!*descr->phmod ||
!(proc = GetProcAddress( *descr->phmod, (LPCSTR)descr->pINT[func].u1.Function )))
proc = DelayLoadFailureHook( descr->szName, (LPCSTR)descr->pINT[func].u1.Function );
descr->pIAT[func].u1.Function = (ULONG_PTR)proc;
return proc;
}
#ifdef __GNUC__
static void free_delay_imports(void) __attribute__((destructor));
static void free_delay_imports(void)
{
struct ImgDelayDescr *descr;
for (descr = __wine_spec_delay_imports; descr->szName; descr++)
if (*descr->phmod) FreeLibrary( *descr->phmod );
}
#endif
tools/winebuild/import.c
View file @ d4098549
......@@ -507,20 +507,10 @@ static void add_extra_undef_symbols( const DLLSPEC *spec )
{
case IMAGE_SUBSYSTEM_WINDOWS_GUI:
case IMAGE_SUBSYSTEM_WINDOWS_CUI:
kernel_imports += add_extra_symbol( extras, &count, "GetCommandLineA", spec );
kernel_imports += add_extra_symbol( extras, &count, "GetStartupInfoA", spec );
kernel_imports += add_extra_symbol( extras, &count, "GetModuleHandleA", spec );
kernel_imports += add_extra_symbol( extras, &count, "ExitProcess", spec );
break;
}
}
if (nb_delayed)
{
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, "DelayLoadFailureHook", spec );
}
/* make sure we import the dlls that contain these functions */
if (kernel_imports) add_import_dll( "kernel32", NULL );
......@@ -604,6 +594,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv )
else add_extra_ld_symbol( "main" );
if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" );
if (nb_delayed) add_extra_ld_symbol( "__wine_spec_delay_load" );
strcpy( name_prefix, asm_name("") );
prefix_len = strlen( name_prefix );
......@@ -905,7 +896,7 @@ static int output_delayed_imports( FILE *outfile, const DLLSPEC *spec )
}
}
fprintf( outfile, "\n" );
fprintf( outfile, "static struct {\n" );
fprintf( outfile, "struct {\n" );
fprintf( outfile, " struct ImgDelayDescr {\n" );
fprintf( outfile, " unsigned int grAttrs;\n" );
fprintf( outfile, " const char *szName;\n" );
......@@ -915,15 +906,15 @@ static int output_delayed_imports( FILE *outfile, const DLLSPEC *spec )
fprintf( outfile, " void* pBoundIAT;\n" );
fprintf( outfile, " void* pUnloadIAT;\n" );
fprintf( outfile, " unsigned long dwTimeStamp;\n" );
fprintf( outfile, " } imp[%d];\n", nb_delayed );
fprintf( outfile, " } imp[%d];\n", nb_delayed + 1 );
fprintf( outfile, " void *IAT[%d];\n", total_delayed );
fprintf( outfile, " const char *INT[%d];\n", total_delayed );
fprintf( outfile, "} delay_imports = {\n" );
fprintf( outfile, "} __wine_spec_delay_imports = {\n" );
fprintf( outfile, " {\n" );
for (i = j = 0; i < nb_imports; i++)
{
if (!dll_imports[i]->delay) continue;
fprintf( outfile, " { 0, \"%s\", &__wine_delay_imp_hmod[%d], &delay_imports.IAT[%d], &delay_imports.INT[%d], 0, 0, 0 },\n",
fprintf( outfile, " { 0, \"%s\", &__wine_delay_imp_hmod[%d], &__wine_spec_delay_imports.IAT[%d], &__wine_spec_delay_imports.INT[%d], 0, 0, 0 },\n",
dll_imports[i]->spec->file_name, i, j, j );
j += dll_imports[i]->nb_imports;
}
......@@ -955,26 +946,6 @@ static int output_delayed_imports( FILE *outfile, const DLLSPEC *spec )
}
fprintf( outfile, " }\n};\n\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" );
fprintf( outfile, "{\n" );
fprintf( outfile, " int idx = idx_nr >> 16, nr = idx_nr & 0xffff;\n" );
fprintf( outfile, " struct ImgDelayDescr *imd = delay_imports.imp + idx;\n" );
fprintf( outfile, " void **pIAT = imd->pIAT + nr;\n" );
fprintf( outfile, " const char** pINT = imd->pINT + nr;\n" );
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, " 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;
}
......@@ -997,17 +968,17 @@ static void output_delayed_import_thunks( FILE *outfile, const DLLSPEC *spec )
{
case CPU_x86:
fprintf( outfile, " \"\\tpushl %%ecx\\n\\tpushl %%edx\\n\\tpushl %%eax\\n\"\n" );
fprintf( outfile, " \"\\tcall %s\\n\"\n", asm_name("__wine_delay_load") );
fprintf( outfile, " \"\\tcall %s\\n\"\n", asm_name("__wine_spec_delay_load") );
fprintf( outfile, " \"\\tpopl %%edx\\n\\tpopl %%ecx\\n\\tjmp *%%eax\\n\"\n" );
break;
case CPU_SPARC:
fprintf( outfile, " \"\\tsave %%sp, -96, %%sp\\n\"\n" );
fprintf( outfile, " \"\\tcall %s\\n\"\n", asm_name("__wine_delay_load") );
fprintf( outfile, " \"\\tcall %s\\n\"\n", asm_name("__wine_spec_delay_load") );
fprintf( outfile, " \"\\tmov %%g1, %%o0\\n\"\n" );
fprintf( outfile, " \"\\tjmp %%o0\\n\\trestore\\n\"\n" );
break;
case CPU_ALPHA:
fprintf( outfile, " \"\\tjsr $26,%s\\n\"\n", asm_name("__wine_delay_load") );
fprintf( outfile, " \"\\tjsr $26,%s\\n\"\n", asm_name("__wine_spec_delay_load") );
fprintf( outfile, " \"\\tjmp $31,($0)\\n\"\n" );
break;
case CPU_POWERPC:
......@@ -1034,7 +1005,7 @@ static void output_delayed_import_thunks( FILE *outfile, const DLLSPEC *spec )
fprintf( outfile, " \"\\tstw %s, %d(%s)\\n\"\n", ppc_reg(0), 44+extra_stack_storage, ppc_reg(1));
/* Call the __wine_delay_load function, arg1 is arg1. */
fprintf( outfile, " \"\\tbl %s\\n\"\n", asm_name("__wine_delay_load") );
fprintf( outfile, " \"\\tbl %s\\n\"\n", asm_name("__wine_spec_delay_load") );
/* Load return value from call into ctr register */
fprintf( outfile, " \"\\tmtctr %s\\n\"\n", ppc_reg(3));
......@@ -1125,7 +1096,7 @@ static void output_delayed_import_thunks( FILE *outfile, const DLLSPEC *spec )
fprintf( outfile, "\n \".align %d\\n\"\n", get_alignment(8) );
fprintf( outfile, " \"%s:\\n\"\n", asm_name(delayed_import_thunks));
pos = nb_delayed * 32;
pos = (nb_delayed + 1) * 32;
for (i = 0; i < nb_imports; i++)
{
if (!dll_imports[i]->delay) continue;
......@@ -1133,7 +1104,7 @@ static void output_delayed_import_thunks( FILE *outfile, const DLLSPEC *spec )
{
ORDDEF *odp = dll_imports[i]->imports[j];
output_import_thunk( outfile, odp->name ? odp->name : odp->export_name,
"delay_imports", pos );
"__wine_spec_delay_imports", pos );
}
}
output_function_size( outfile, delayed_import_thunks );
......
tools/winebuild/spec32.c
View file @ d4098549
......@@ -534,20 +534,10 @@ void BuildSpec32File( FILE *outfile, DLLSPEC *spec )
" if (reason == %d && __wine_spec_init_state == 1)\n"
" _init( __wine_main_argc, __wine_main_argv, __wine_main_environ );\n"
" ret = %s( inst, reason, reserved );\n"
" if (reason == %d && __wine_spec_init_state == 1)\n",
" if (reason == %d && __wine_spec_init_state == 1)\n"
" _fini();\n"
" return ret;\n}\n",
DLL_PROCESS_ATTACH, init_func, DLL_PROCESS_DETACH );
if (!nr_delayed)
fprintf( outfile, " _fini();\n" );
else
fprintf( outfile,
" {\n"
" extern int __stdcall FreeLibrary(void *);\n"
" unsigned int i;\n"
" _fini();\n"
" for (i = 0; i < sizeof(__wine_delay_imp_hmod)/sizeof(__wine_delay_imp_hmod[0]); i++)\n"
" if (__wine_delay_imp_hmod[i]) FreeLibrary( __wine_delay_imp_hmod[i] );\n"
" }\n" );
fprintf( outfile, " return ret;\n}\n" );
init_func = "__wine_dll_main";
}
else switch(spec->subsystem)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment