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

winebuild: Check if a given forward does exist in one of the imported dlls, fix a couple of problems detected.

This commit is contained in:
Dmitry Timoshkov 2007-04-09 14:40:57 +09:00 committed by Alexandre Julliard
parent f2acf60044
commit d57872567d
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/imm32/imm32.spec
View File

@ -93,7 +93,7 @@
@ stdcall ImmSetCompositionStringW(long long ptr long ptr long) @ stdcall ImmSetCompositionStringW(long long ptr long ptr long)
@ stdcall ImmSetCompositionWindow(long ptr) @ stdcall ImmSetCompositionWindow(long ptr)
@ stdcall ImmSetConversionStatus(long long long) @ stdcall ImmSetConversionStatus(long long long)
@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey
@ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetOpenStatus(long long)
@ stdcall ImmSetStatusWindowPos(long ptr) @ stdcall ImmSetStatusWindowPos(long ptr)
@ stub ImmShowSoftKeyboard @ stub ImmShowSoftKeyboard

2
dlls/w32skrnl/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = w32skrnl.dll MODULE = w32skrnl.dll
IMPORTS = kernel32 IMPORTS = kernel32 ntdll
C_SRCS = \ C_SRCS = \
w32skernel.c \ w32skernel.c \

42
tools/winebuild/import.c
View File

@ -429,6 +429,42 @@ static int check_unused( const struct import* imp, const DLLSPEC *spec )
return 1; return 1;
} }
/* check if a given forward does exist in one of the imported dlls */
static void check_undefined_forward( DLLSPEC *spec, ORDDEF *odp )
{
char *link_name, *api_name, *dll_name, *p;
int i, found = 0;
assert( odp->flags & FLAG_FORWARD );
link_name = xstrdup( odp->link_name );
p = strrchr( link_name, '.' );
*p = 0;
api_name = p + 1;
dll_name = get_dll_name( link_name, NULL );
for (i = 0; i < nb_imports; i++)
{
struct import *imp = dll_imports[i];
if (!strcasecmp( imp->spec->file_name, dll_name ))
{
if (find_export( api_name, imp->exports, imp->nb_exports ))
{
found = 1;
break;
}
}
}
free( link_name );
free( dll_name );
if (!found)
warning( "%s:%d: forward '%s' not found in the imported dll list\n",
spec->src_name, odp->lineno, odp->link_name );
}
/* flag the dll exports that link to an undefined symbol */ /* flag the dll exports that link to an undefined symbol */
static void check_undefined_exports( DLLSPEC *spec ) static void check_undefined_exports( DLLSPEC *spec )
{ {
@ -438,7 +474,11 @@ static void check_undefined_exports( DLLSPEC *spec )
{ {
ORDDEF *odp = &spec->entry_points[i]; ORDDEF *odp = &spec->entry_points[i];
if (odp->type == TYPE_STUB) continue; if (odp->type == TYPE_STUB) continue;
if (odp->flags & FLAG_FORWARD) continue; if (odp->flags & FLAG_FORWARD)
{
check_undefined_forward( spec, odp );
continue;
}
if (find_name( odp->link_name, &undef_symbols )) if (find_name( odp->link_name, &undef_symbols ))
{ {
switch(odp->type) switch(odp->type)