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

Close GH-16718: Add SAPI module folder to DLL search path #16958

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

Close GH-16718: Add SAPI module folder to DLL search path #16958

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
20 changes: 20 additions & 0 deletions main/SAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,31 @@ static void sapi_globals_dtor(sapi_globals_struct *sapi_globals)
SAPI_API sapi_module_struct sapi_module;


#ifdef PHP_WIN32
static void add_sapi_module_folder_to_dll_search_path(sapi_module_struct *sf)
{
const DWORD flags = GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT;
HMODULE module;
wchar_t filename[MAX_PATH];
if (GetModuleHandleEx(flags, (LPCTSTR) sf, &module)) {
DWORD len = GetModuleFileNameW(module, filename, MAX_PATH);
if (len > 0 && len < MAX_PATH) {
wchar_t *slash = wcsrchr(filename, L'\\');
slash[0] = L'\0';
SetDllDirectoryW(filename);
}
}
}
#endif

SAPI_API void sapi_startup(sapi_module_struct *sf)
{
sf->ini_entries = NULL;
sapi_module = *sf;

#ifdef PHP_WIN32
add_sapi_module_folder_to_dll_search_path(sf);
#endif
#ifdef ZTS
ts_allocate_fast_id(&sapi_globals_id, &sapi_globals_offset, sizeof(sapi_globals_struct), (ts_allocate_ctor) sapi_globals_ctor, (ts_allocate_dtor) sapi_globals_dtor);
# ifdef PHP_WIN32
Expand Down