Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove long deprecated Apple APIs from DLL.cpp #153

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove long deprecated Apple APIs from DLL.cpp #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 6 additions & 40 deletions CPP/Windows/DLL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include "StdAfx.h"

#ifdef __APPLE_CC__
#include <mach-o/dyld.h>
#elif ENV_BEOS
#ifdef ENV_BEOS
#include <kernel/image.h>
#include <Path.h>
#else
Expand Down Expand Up @@ -34,9 +32,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%p)\n",(void *)this,(void *)_module)))
if (_module == 0)
return true;

#ifdef __APPLE_CC__
int ret = NSUnLinkModule ((NSModule)_module, 0);
#elif ENV_BEOS
#ifdef ENV_BEOS
int ret = unload_add_on((image_id)_module);
#else
int ret = dlclose(_module);
Expand All @@ -52,19 +48,7 @@ static FARPROC local_GetProcAddress(HMODULE module,LPCSTR lpProcName)
void *ptr = 0;
TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
if (module) {
#ifdef __APPLE_CC__
char name[MAX_PATHNAME_LEN];
snprintf(name,sizeof(name),"_%s",lpProcName);
name[sizeof(name)-1] = 0;
TRACEN((printf("NSLookupSymbolInModule(%p,%s)\n",(void *)module,name)))
NSSymbol sym;
sym = NSLookupSymbolInModule((NSModule)module, name);
if (sym) {
ptr = NSAddressOfSymbol(sym);
} else {
ptr = 0;
}
#elif ENV_BEOS
#ifdef ENV_BEOS
if (get_image_symbol((image_id)module, lpProcName, B_SYMBOL_TYPE_TEXT, &ptr) != B_OK)
ptr = 0;
#else
Expand Down Expand Up @@ -103,19 +87,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileName)

TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))

#ifdef __APPLE_CC__
NSObjectFileImage image;
NSObjectFileImageReturnCode nsret;

nsret = NSCreateObjectFileImageFromFile (name, &image);
if (nsret == NSObjectFileImageSuccess) {
TRACEN((printf("NSCreateObjectFileImageFromFile(%s) : OK\n",name)))
handler = (HMODULE)NSLinkModule(image,name,NSLINKMODULE_OPTION_RETURN_ON_ERROR
| NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_BINDNOW);
} else {
TRACEN((printf("NSCreateObjectFileImageFromFile(%s) : ERROR\n",name)))
}
#elif ENV_BEOS
#ifdef ENV_BEOS
// normalize path (remove things like "./", "..", etc..), otherwise it won't work
BPath p(name, NULL, true);
status_t err = B_OK;
Expand Down Expand Up @@ -143,7 +115,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.Path(),(int)image)))
#endif
TRACEN((printf("CLibrary::Load - dlopen(%s,0x%d)\n",name,options_dlopen)))
handler = dlopen(name,options_dlopen);
#endif // __APPLE_CC__
#endif // ENV_BEOS
TRACEN((printf("CLibrary::Load(%s) => %p\n",name,handler)))
if (handler) {

Expand All @@ -161,13 +133,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.Path(),(int)image)))
if (fctTest) fctTest();

} else {
#ifdef __APPLE_CC__
NSLinkEditErrors c;
int num_err;
const char *file,*err;
NSLinkEditError(&c,&num_err,&file,&err);
printf("Can't load '%ls' (%s)\n", lpLibFileName,err); // lpLibFileName to name
#elif ENV_BEOS
#ifdef ENV_BEOS
printf("Can't load '%ls' (%s)\n", lpLibFileName,strerror(err));
#else
printf("Can't load '%ls' (%s)\n", lpLibFileName,dlerror());
Expand Down