mirror of https://github.com/lukechilds/node.git
Browse Source
On Windows, when node or io.js attempts to dynamically load a compiled addon, the compiled addon tries to load node.exe or iojs.exe again - depending on which import library the module used when it was linked. This makes it impossible to rename node.exe or iojs.exe, because when that happens the module can't find its dependencies. With this patch, a delay-load hook is added to all modules that are compiled with node-gyp. The delay-load hook ensures that whenever a module tries to load imports from node.exe/iojs.exe, it'll just refer back to the process image, thus making it possible to rename the iojs/node binary. Bug: https://github.com/iojs/io.js/issues/751 Bug: https://github.com/iojs/io.js/issues/965 Upstream PR: https://github.com/TooTallNate/node-gyp/pull/599 PR-URL: https://github.com/iojs/io.js/pull/1251 Reviewed-By: Rod Vagg <rod@vagg.org>v1.8.0-commit
Bert Belder
10 years ago
2 changed files with 44 additions and 0 deletions
@ -0,0 +1,32 @@ |
|||||
|
/*
|
||||
|
* When this file is linked to a DLL, it sets up a delay-load hook that |
||||
|
* intervenes when the DLL is trying to load 'node.exe' or 'iojs.exe' |
||||
|
* dynamically. Instead of trying to locate the .exe file it'll just return |
||||
|
* a handle to the process image. |
||||
|
* |
||||
|
* This allows compiled addons to work when node.exe or iojs.exe is renamed. |
||||
|
*/ |
||||
|
|
||||
|
#ifdef _MSC_VER |
||||
|
|
||||
|
#define WIN32_LEAN_AND_MEAN |
||||
|
#include <windows.h> |
||||
|
|
||||
|
#include <delayimp.h> |
||||
|
#include <string.h> |
||||
|
|
||||
|
static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo* info) { |
||||
|
if (event != dliNotePreLoadLibrary) |
||||
|
return NULL; |
||||
|
|
||||
|
if (_stricmp(info->szDll, "iojs.exe") != 0 && |
||||
|
_stricmp(info->szDll, "node.exe") != 0) |
||||
|
return NULL; |
||||
|
|
||||
|
HMODULE m = GetModuleHandle(NULL); |
||||
|
return (FARPROC) m; |
||||
|
} |
||||
|
|
||||
|
PfnDliHook __pfnDliNotifyHook2 = load_exe_hook; |
||||
|
|
||||
|
#endif |
Loading…
Reference in new issue