Module: wine Branch: master Commit: f3696e489b8b33011b5a32acf330f0684b6d151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3696e489b8b33011b5a32acf3... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:30:52 2010 +0100 krnl386.exe: Add an explicit name check to allow importing user.exe and gdi.exe even if not loaded already. --- dlls/krnl386.exe16/ne_module.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index aa1c9c2..49b527b 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -782,9 +782,12 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; + /* special magic for gdi and user */ + if (!NE_strcasecmp( buffer, "user" )) strcpy( buffer, "USER.EXE" ); + else if (!NE_strcasecmp( buffer, "gdi" )) strcpy( buffer, "GDI.EXE" ); /* Append .DLL to name if no extension present */ - if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + else if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) + strcat( buffer, ".DLL" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) {