Author: cwittich Date: Sun Sep 7 08:50:09 2008 New Revision: 36030
URL: http://svn.reactos.org/svn/reactos?rev=36030&view=rev Log: Use MS-style imports instead of Borland-style for builtins patch by Alexandre Julliard <julliard at winehq.org>
Modified: trunk/reactos/tools/winebuild/import.c
Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?re... ============================================================================== --- trunk/reactos/tools/winebuild/import.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/import.c [iso-8859-1] Sun Sep 7 08:50:09 2008 @@ -755,7 +755,8 @@ { if (dll_imports[i]->delay) continue; dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); - output( "\t.long 0\n" ); /* OriginalFirstThunk */ + output( "\t.long .L__wine_spec_import_data_names+%d-.L__wine_spec_rva_base\n", /* OriginalFirstThunk */ + j * get_ptr_size() ); output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* ForwarderChain */ output( "\t.long .L__wine_spec_import_name_%s-.L__wine_spec_rva_base\n", /* Name */ @@ -771,7 +772,7 @@ output( "\t.long 0\n" ); /* FirstThunk */
output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_import_data_ptrs:\n" ); + output( ".L__wine_spec_import_data_names:\n" ); for (i = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; @@ -790,6 +791,13 @@ output( "\t.long 0x8000%04x\n", odp->ordinal ); } } + output( "\t%s 0\n", get_asm_ptr_keyword() ); + } + output( ".L__wine_spec_import_data_ptrs:\n" ); + for (i = 0; i < nb_imports; i++) + { + if (dll_imports[i]->delay) continue; + for (j = 0; j < dll_imports[i]->nb_imports; j++) output( "\t%s 0\n", get_asm_ptr_keyword() ); output( "\t%s 0\n", get_asm_ptr_keyword() ); } output( ".L__wine_spec_imports_end:\n" );