From d0a57ea2b563f74a9558aae55a57c1f0f162a813 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 28 Sep 2013 14:06:39 -0700 Subject: [PATCH] Rolled back my LoadLibrary change. The first failed call causes a dialog to pop up in Windows apps (but not console apps) and that's really bad. I'll have to deal with this in my app. --- src/loadso/windows/SDL_sysloadso.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/loadso/windows/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c index ebad03453..21e7a6c54 100644 --- a/src/loadso/windows/SDL_sysloadso.c +++ b/src/loadso/windows/SDL_sysloadso.c @@ -34,19 +34,6 @@ SDL_LoadObject(const char *sofile) { LPTSTR tstr = WIN_UTF8ToString(sofile); void *handle = (void *) LoadLibrary(tstr); - - /* By default LoadLibrary uses the current working directory - * as the first item on the search path for implicit dependencies - * of whatever it's loading. That is somewhat inconsistent with - * what dlopen does on other platforms, so we will try again - * with LoadLibraryEx and a slightly different search path. This - * causes Windows to search for dependencies in the directory - * that the module itself lives in. */ - if(handle == NULL) - { - handle = (void *) LoadLibraryEx(tstr, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - } - SDL_free(tstr); /* Generate an error message if all loads failed */