Skip to content

Commit

Permalink
win: allow node.exe/iojs.exe to be renamed
Browse files Browse the repository at this point in the history
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: nodejs/node#751
Bug: nodejs/node#965
Downstream PR: nodejs/node#1251

PR-URL: nodejs#599
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
piscisaureus committed Mar 25, 2015
1 parent abad2b5 commit 1670d26
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
12 changes: 12 additions & 0 deletions addon.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
},
}],
[ 'OS=="win"', {
'sources': [
'src/win_delay_load_hook.c',
],
'libraries': [
'-lkernel32.lib',
'-luser32.lib',
Expand All @@ -47,6 +50,15 @@
# warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent<T>'
# needs to have dll-interface to be used by clients of class 'node::ObjectWrap'
'msvs_disabled_warnings': [ 4251 ],
# Set up delay-loading for node.exe/iojs.exe so the loadable module
# will still be able to find its imports if the binary is renamed.
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [ 'iojs.exe', 'node.exe' ],
# Don't print a linker warning when no imports from either .exe are used.
'AdditionalOptions': [ '/ignore:4199' ],
}
},
}, {
# OS!="win"
'defines': [ '_LARGEFILE_SOURCE', '_FILE_OFFSET_BITS=64' ],
Expand Down
32 changes: 32 additions & 0 deletions src/win_delay_load_hook.c
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1670d26

Please sign in to comment.