system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 12:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

winebuild: Make the 16-bit DOS header a local symbol.

Browse source
This commit is contained in:
Alexandre Julliard 2009-02-24 17:47:09 +01:00
parent 728d87d0f5
commit 445047a97e
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/winebuild/build.h
View file

@ -213,7 +213,7 @@ extern int load_res32_file( const char *name, DLLSPEC *spec );
extern void output_resources( DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec );
extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void load_res16_file( const char *name, DLLSPEC *spec );
extern void output_res16_data( DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec );
extern void output_res16_directory( DLLSPEC *spec, const char *header_name ); extern void output_res16_directory( DLLSPEC *spec );
extern void BuildRelays16(void); extern void BuildRelays16(void);
extern void BuildRelays32(void); extern void BuildRelays32(void);

6
tools/winebuild/res16.c
View file

@ -267,7 +267,7 @@ void output_res16_data( DLLSPEC *spec )
} }
/* output the resource definitions */ /* output the resource definitions */
void output_res16_directory( DLLSPEC *spec, const char *header_name ) void output_res16_directory( DLLSPEC *spec )
{ {
unsigned int i, j; unsigned int i, j;
struct res_tree *tree; struct res_tree *tree;
@ -293,8 +293,8 @@ void output_res16_directory( DLLSPEC *spec, const char *header_name )
for (j = 0, res = type->res; j < type->nb_names; j++, res++) for (j = 0, res = type->res; j < type->nb_names; j++, res++)
{ {
output( "\t%s .L__wine_spec_resource_%lu-%s\n", output( "\t%s .L__wine_spec_resource_%lu-.L__wine_spec_dos_header\n",
get_asm_short_keyword(), (unsigned long)(res - spec->resources), header_name ); get_asm_short_keyword(), (unsigned long)(res - spec->resources) );
output( "\t%s .L__wine_spec_resource_%lu_end-.L__wine_spec_resource_%lu\n", output( "\t%s .L__wine_spec_resource_%lu_end-.L__wine_spec_resource_%lu\n",
get_asm_short_keyword(), (unsigned long)(res - spec->resources), get_asm_short_keyword(), (unsigned long)(res - spec->resources),
(unsigned long)(res - spec->resources) ); (unsigned long)(res - spec->resources) );

28
tools/winebuild/spec16.c
View file

@ -451,7 +451,7 @@ static int sort_func_list( ORDDEF **list, int count,
* *
* Output the dll initialization code. * Output the dll initialization code.
*/ */
static void output_init_code( const DLLSPEC *spec, const char *header_name ) static void output_init_code( const DLLSPEC *spec )
{ {
char name[80]; char name[80];
@ -468,13 +468,13 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name )
output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") );
output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" );
output( "\tpushl %%ecx\n" ); output( "\tpushl %%ecx\n" );
output( "\tleal %s-1b(%%eax),%%ecx\n", header_name ); output( "\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" );
output( "\tpushl %%ecx\n" ); output( "\tpushl %%ecx\n" );
} }
else else
{ {
output( "\tpushl $.L__wine_spec_file_name\n" ); output( "\tpushl $.L__wine_spec_file_name\n" );
output( "\tpushl $%s\n", header_name ); output( "\tpushl $.L__wine_spec_dos_header\n" );
} }
output( "\tcall %s\n", asm_name("__wine_dll_register_16") ); output( "\tcall %s\n", asm_name("__wine_dll_register_16") );
output( "\taddl $12,%%esp\n" ); output( "\taddl $12,%%esp\n" );
@ -490,12 +490,12 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name )
if (UsePIC) if (UsePIC)
{ {
output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") );
output( "1:\tleal %s-1b(%%eax),%%ecx\n", header_name ); output( "1:\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" );
output( "\tpushl %%ecx\n" ); output( "\tpushl %%ecx\n" );
} }
else else
{ {
output( "\tpushl $%s\n", header_name ); output( "\tpushl $.L__wine_spec_dos_header\n" );
} }
output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") );
output( "\taddl $12,%%esp\n" ); output( "\taddl $12,%%esp\n" );
@ -531,7 +531,6 @@ void BuildSpec16File( DLLSPEC *spec )
ORDDEF **typelist; ORDDEF **typelist;
ORDDEF *entry_point = NULL; ORDDEF *entry_point = NULL;
int i, j, nb_funcs; int i, j, nb_funcs;
char header_name[256];
/* File header */ /* File header */
@ -587,11 +586,10 @@ void BuildSpec16File( DLLSPEC *spec )
/* Output the module structure */ /* Output the module structure */
sprintf( header_name, "__wine_spec_%s_dos_header", make_c_identifier(spec->dll_name) );
output( "\n/* module data */\n\n" ); output( "\n/* module data */\n\n" );
output( "\t.data\n" ); output( "\t.data\n" );
output( "\t.align %d\n", get_alignment(4) ); output( "\t.align %d\n", get_alignment(4) );
output( "%s:\n", header_name ); output( ".L__wine_spec_dos_header:\n" );
output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* e_magic */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* e_magic */
IMAGE_DOS_SIGNATURE ); IMAGE_DOS_SIGNATURE );
output( "\t%s 0\n", get_asm_short_keyword() ); /* e_cblp */ output( "\t%s 0\n", get_asm_short_keyword() ); /* e_cblp */
@ -611,7 +609,7 @@ void BuildSpec16File( DLLSPEC *spec )
output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oemid */ output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oemid */
output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oeminfo */ output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oeminfo */
output( "\t%s 0,0,0,0,0,0,0,0,0,0\n", get_asm_short_keyword() ); /* e_res2 */ output( "\t%s 0,0,0,0,0,0,0,0,0,0\n", get_asm_short_keyword() ); /* e_res2 */
output( "\t.long .L__wine_spec_ne_header-%s\n", header_name ); /* e_lfanew */ output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */
output( ".L__wine_spec_ne_header:\n" ); output( ".L__wine_spec_ne_header:\n" );
output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_magic */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_magic */
@ -663,8 +661,8 @@ void BuildSpec16File( DLLSPEC *spec )
/* code segment entry */ /* code segment entry */
output( "\t%s .L__wine_spec_code_segment-%s\n", /* filepos */ output( "\t%s .L__wine_spec_code_segment-.L__wine_spec_dos_header\n", /* filepos */
get_asm_short_keyword(), header_name ); get_asm_short_keyword() );
output( "\t%s .L__wine_spec_code_segment_end-.L__wine_spec_code_segment\n", /* size */ output( "\t%s .L__wine_spec_code_segment_end-.L__wine_spec_code_segment\n", /* size */
get_asm_short_keyword() ); get_asm_short_keyword() );
output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_32BIT ); /* flags */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_32BIT ); /* flags */
@ -673,8 +671,8 @@ void BuildSpec16File( DLLSPEC *spec )
/* data segment entry */ /* data segment entry */
output( "\t%s .L__wine_spec_data_segment-%s\n", /* filepos */ output( "\t%s .L__wine_spec_data_segment-.L__wine_spec_dos_header\n", /* filepos */
get_asm_short_keyword(), header_name ); get_asm_short_keyword() );
output( "\t%s .L__wine_spec_data_segment_end-.L__wine_spec_data_segment\n", /* size */ output( "\t%s .L__wine_spec_data_segment_end-.L__wine_spec_data_segment\n", /* size */
get_asm_short_keyword() ); get_asm_short_keyword() );
output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_DATA ); /* flags */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_DATA ); /* flags */
@ -683,7 +681,7 @@ void BuildSpec16File( DLLSPEC *spec )
/* resource directory */ /* resource directory */
output_res16_directory( spec, header_name ); output_res16_directory( spec );
/* resident names table */ /* resident names table */
@ -835,7 +833,7 @@ void BuildSpec16File( DLLSPEC *spec )
output_stubs( spec ); output_stubs( spec );
output_get_pc_thunk(); output_get_pc_thunk();
output_init_code( spec, header_name ); output_init_code( spec );
output_gnu_stack_note(); output_gnu_stack_note();
free( typelist ); free( typelist );