Removed no longer used elfdll loader.

This commit is contained in:
Alexandre Julliard 2000-12-09 03:25:34 +00:00
parent 1af53cbb2a
commit 84f91bd3fc
6 changed files with 5 additions and 254 deletions

View File

@ -2,10 +2,10 @@ name ntdll
type win32 type win32
debug_channels (aspi atom cdrom console ddraw debug delayhlp dll dosfs dosmem debug_channels (aspi atom cdrom console ddraw debug delayhlp dll dosfs dosmem
elfdll file fixup global heap int int10 int16 int17 int19 int21 file fixup global heap int int10 int16 int17 int19 int21 int31
int31 io ldt local module ntdll process profile reg relay resource io local module ntdll process profile reg relay resource segment
segment seh selector server snoop string system tape task thread seh selector server snoop string system tape task thread thunk
thunk timer toolhelp tweak ver virtual vxd win32) timer toolhelp tweak ver virtual vxd win32)
#note that the Zw... functions are alternate names for the #note that the Zw... functions are alternate names for the
#Nt... functions. (see www.sysinternals.com for details) #Nt... functions. (see www.sysinternals.com for details)

View File

@ -1,17 +0,0 @@
#ifndef __WINE_ELFDLL_H
#define __WINE_ELFDLL_H
#include "config.h"
#include "module.h"
#include "windef.h"
WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR libname, DWORD flags);
#if defined(HAVE_DL_API)
void *ELFDLL_dlopen(const char *libname, int flags);
extern char *extra_ld_library_path;
#endif
#endif

View File

@ -7,7 +7,6 @@ MODULE = loader
C_SRCS = \ C_SRCS = \
elf.c \ elf.c \
elfdll.c \
loadorder.c \ loadorder.c \
main.c \ main.c \
module.c \ module.c \

View File

@ -23,7 +23,6 @@
#include "module.h" #include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "winerror.h" #include "winerror.h"
#include "elfdll.h"
DEFAULT_DEBUG_CHANNEL(win32); DEFAULT_DEBUG_CHANNEL(win32);

View File

@ -1,214 +0,0 @@
/*
* Elf-dll loader functions
*
* Copyright 1999 Bertho A. Stultiens
*/
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include "config.h"
#include "windef.h"
#include "global.h"
#include "process.h"
#include "module.h"
#include "heap.h"
#include "wine/winbase16.h"
#include "elfdll.h"
#include "debugtools.h"
#include "winerror.h"
DEFAULT_DEBUG_CHANNEL(elfdll);
#if defined(HAVE_DL_API)
#include <dlfcn.h>
/*------------------ HACKS -----------------*/
extern DWORD fixup_imports(WINE_MODREF *wm);
extern void dump_exports(HMODULE hModule);
/*---------------- END HACKS ---------------*/
char *extra_ld_library_path = NULL; /* The extra search-path set in wine.conf */
struct elfdll_image
{
HMODULE pe_module_start;
DWORD pe_module_size;
NE_MODULE *ne_module_start;
DWORD ne_module_size;
};
/****************************************************************************
* ELFDLL_dlopen
*
* Wrapper for dlopen to search the EXTRA_LD_LIBRARY_PATH from wine.conf
* manually because libdl.so caches the environment and does not accept our
* changes.
*/
void *ELFDLL_dlopen(const char *libname, int flags)
{
char buffer[256];
int namelen;
void *handle;
char *ldpath;
/* First try the default path search of dlopen() */
handle = dlopen(libname, flags);
/* do NOT call dlerror() here ! (check after return) */
if(handle)
return handle;
/* Now try to construct searches through our extra search-path */
namelen = strlen(libname);
ldpath = extra_ld_library_path;
while(ldpath && *ldpath)
{
int len;
char *cptr;
char *from;
from = ldpath;
cptr = strchr(ldpath, ':');
if(!cptr)
{
len = strlen(ldpath);
ldpath = NULL;
}
else
{
len = cptr - ldpath;
ldpath = cptr + 1;
}
if(len + namelen + 1 >= sizeof(buffer))
{
ERR("Buffer overflow! Check EXTRA_LD_LIBRARY_PATH or increase buffer size.\n");
return NULL;
}
strncpy(buffer, from, len);
if(len)
{
buffer[len] = '/';
strcpy(buffer + len + 1, libname);
}
else
strcpy(buffer + len, libname);
TRACE("Trying dlopen('%s', %d)\n", buffer, flags);
handle = dlopen(buffer, flags);
/* do NOT call dlerror() here ! (check after return) */
if(handle)
return handle;
}
return NULL;
}
/****************************************************************************
* get_sobasename (internal)
*
*/
static LPSTR get_sobasename(LPCSTR path, LPSTR name)
{
char *cptr;
/* Strip the path from the library name */
if((cptr = strrchr(path, '/')))
{
char *cp = strrchr(cptr+1, '\\');
if(cp && cp > cptr)
cptr = cp;
}
else
cptr = strrchr(path, '\\');
if(!cptr)
cptr = (char *)path; /* No '/' nor '\\' in path */
else
cptr++;
strcpy(name, cptr);
cptr = strrchr(name, '.');
if(cptr && !strcasecmp(cptr,".dll")) *cptr = '\0'; /* Strip extension */
/* Convert to lower case.
* This must be done manually because it is not sure that
* other modules are accessible.
*/
for(cptr = name; *cptr; cptr++)
*cptr = tolower(*cptr);
return name;
}
/****************************************************************************
* ELFDLL_LoadLibraryExA (internal)
*
* Implementation of elf-dll loading for PE modules
*/
WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR path, DWORD flags)
{
LPVOID dlhandle;
struct elfdll_image *image;
char name[129];
char soname[129];
WINE_MODREF *wm;
get_sobasename(path, name);
strcpy(soname, name);
strcat(soname, ".so");
/* Try to open the elf-dll */
dlhandle = ELFDLL_dlopen(soname, RTLD_LAZY);
if(!dlhandle)
{
WARN("Could not load %s (%s)\n", soname, dlerror());
SetLastError( ERROR_FILE_NOT_FOUND );
return NULL;
}
/* Get the 'dllname_elfdll_image' variable */
strcpy(soname, name);
strcat(soname, "_elfdll_image");
image = (struct elfdll_image *)dlsym(dlhandle, soname);
if(!image)
{
ERR("Could not get elfdll image descriptor %s (%s)\n", soname, dlerror());
dlclose(dlhandle);
SetLastError( ERROR_BAD_FORMAT );
return NULL;
}
wm = PE_CreateModule( image->pe_module_start, path, 0, -1, FALSE );
if(!wm)
{
ERR("Could not create WINE_MODREF for %s\n", path);
dlclose(dlhandle);
SetLastError( ERROR_OUTOFMEMORY );
return NULL;
}
wm->dlhandle = dlhandle;
dump_exports(image->pe_module_start);
return wm;
}
#else
/*
* No elfdlls possible
* Just put stubs in here.
*/
WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR libname, DWORD flags)
{
SetLastError( ERROR_FILE_NOT_FOUND );
return NULL;
}
#endif

View File

@ -15,7 +15,6 @@
#include "heap.h" #include "heap.h"
#include "file.h" #include "file.h"
#include "module.h" #include "module.h"
#include "elfdll.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(module); DEFAULT_DEBUG_CHANNEL(module);
@ -175,7 +174,7 @@ static BOOL ParseLoadOrder(char *order, module_loadorder_t *mlo)
case 'E': /* Elfdll */ case 'E': /* Elfdll */
case 'e': case 'e':
if (!warn++) MESSAGE("Load order 'elfdll' no longer support, ignored\n"); if (!warn++) MESSAGE("Load order 'elfdll' no longer supported, ignored\n");
break; break;
case 'S': /* So */ case 'S': /* So */
case 's': type = MODULE_LOADORDER_SO; break; case 's': type = MODULE_LOADORDER_SO; break;
@ -338,10 +337,6 @@ endit:
* [DllDefaults] * [DllDefaults]
* *
* Keys: * Keys:
* EXTRA_LD_LIBRARY_PATH=/usr/local/lib/wine[:/more/path/to/search[:...]]
* The path will be appended to any existing LD_LIBRARY_PATH from the
* environment (see note in code below).
*
* DefaultLoadOrder=native,so,builtin * DefaultLoadOrder=native,so,builtin
* A comma separated list of module types to try to load in that specific * A comma separated list of module types to try to load in that specific
* order. The DefaultLoadOrder key is used as a fallback when a module is * order. The DefaultLoadOrder key is used as a fallback when a module is
@ -387,17 +382,6 @@ BOOL MODULE_InitLoadOrder(void)
int idx; int idx;
const struct tagDllPair *dllpair; const struct tagDllPair *dllpair;
#if defined(HAVE_DL_API)
/* Get/set the new LD_LIBRARY_PATH */
nbuffer = PROFILE_GetWineIniString("DllDefaults", "EXTRA_LD_LIBRARY_PATH", "", buffer, sizeof(buffer));
if(nbuffer)
{
extra_ld_library_path = HEAP_strdupA(GetProcessHeap(), 0, buffer);
TRACE("Setting extra LD_LIBRARY_PATH=%s\n", buffer);
}
#endif
/* Get the default load order */ /* Get the default load order */
nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,b,s", buffer, sizeof(buffer)); nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,b,s", buffer, sizeof(buffer));
if(!nbuffer) if(!nbuffer)