diff options
author | ImJezze <jezze@gmx.net> | 2015-10-20 21:34:36 +0200 |
---|---|---|
committer | ImJezze <jezze@gmx.net> | 2015-10-20 21:34:36 +0200 |
commit | a7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch) | |
tree | 854b859d6176802c0278f4b00de3f7c774e02dda /src/osd/windows/winmain.c | |
parent | 4610935e796661874bb4ee7ec6536d9423aeb7be (diff) | |
parent | 74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff) |
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/windows/winmain.c')
-rw-r--r-- | src/osd/windows/winmain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index 1a7fe7fc6a3..a67617f6eaf 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -374,6 +374,7 @@ const options_entry windows_options::s_option_entries[] = // input options { NULL, NULL, OPTION_HEADER, "INPUT DEVICE OPTIONS" }, + { WINOPTION_GLOBAL_INPUTS ";global_inputs", "0", OPTION_BOOLEAN, "enable global inputs" }, { WINOPTION_DUAL_LIGHTGUN ";dual", "0", OPTION_BOOLEAN, "enable dual lightgun input" }, { NULL } @@ -1322,7 +1323,7 @@ FPTR symbol_manager::get_text_section_base() dynamic_bind<PIMAGE_NT_HEADERS (WINAPI *)(PVOID)> image_nt_header(TEXT("dbghelp.dll"), "ImageNtHeader"); // start with the image base - PVOID base = reinterpret_cast<PVOID>(GetModuleHandle(NULL)); + PVOID base = reinterpret_cast<PVOID>(GetModuleHandleUni()); assert(base != NULL); // make sure we have the functions we need |