ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebuild: List stubs in the import library .def files. 

This way we have the full list of names to compute ordinal hints.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-03-20 12:33:14 +01:00
parent 074ec5844b
commit 32b365c9c5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/winebuild/build.h
View File

@ -308,7 +308,7 @@ extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva );
extern void output_spec32_file( DLLSPEC *spec ); extern void output_spec32_file( DLLSPEC *spec );
extern void output_pe_module( DLLSPEC *spec ); extern void output_pe_module( DLLSPEC *spec );
extern void output_fake_module( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec );
extern void output_def_file( DLLSPEC *spec, int include_private ); extern void output_def_file( DLLSPEC *spec, int include_stubs );
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_bin_res16_data( DLLSPEC *spec ); extern void output_bin_res16_data( DLLSPEC *spec );

16
tools/winebuild/spec32.c
View File

@ -934,7 +934,7 @@ void output_fake_module( DLLSPEC *spec )
* *
* Build a Win32 def file from a spec file. * Build a Win32 def file from a spec file.
*/ */
void output_def_file( DLLSPEC *spec, int include_private ) void output_def_file( DLLSPEC *spec, int include_stubs )
{ {
DLLSPEC *spec32 = NULL; DLLSPEC *spec32 = NULL;
const char *name; const char *name;
@ -961,16 +961,14 @@ void output_def_file( DLLSPEC *spec, int include_private )
for (i = total = 0; i < spec->nb_entry_points; i++) for (i = total = 0; i < spec->nb_entry_points; i++)
{ {
const ORDDEF *odp = &spec->entry_points[i]; const ORDDEF *odp = &spec->entry_points[i];
int is_data = 0; int is_data = 0, is_private = odp->flags & FLAG_PRIVATE;
if (odp->name) name = odp->name; if (odp->name) name = odp->name;
else if (odp->export_name) name = odp->export_name; else if (odp->export_name) name = odp->export_name;
else continue; else continue;
if (!(odp->flags & FLAG_PRIVATE)) total++; if (!is_private) total++;
else if (!include_private) continue; if (!include_stubs && odp->type == TYPE_STUB) continue;
if (odp->type == TYPE_STUB) continue;
output( " %s", name ); output( " %s", name );
@ -995,13 +993,17 @@ void output_def_file( DLLSPEC *spec, int include_private )
output( "=%s", get_link_name( odp )); output( "=%s", get_link_name( odp ));
break; break;
} }
case TYPE_STUB:
if (!kill_at && target_cpu == CPU_x86) output( "@%d", get_args_size( odp ));
is_private = 1;
break;
default: default:
assert(0); assert(0);
} }
output( " @%d", odp->ordinal ); output( " @%d", odp->ordinal );
if (!odp->name || (odp->flags & FLAG_ORDINAL)) output( " NONAME" ); if (!odp->name || (odp->flags & FLAG_ORDINAL)) output( " NONAME" );
if (is_data) output( " DATA" ); if (is_data) output( " DATA" );
if (odp->flags & FLAG_PRIVATE) output( " PRIVATE" ); if (is_private) output( " PRIVATE" );
output( "\n" ); output( "\n" );
} }
if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name ); if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name );