diff options
| author | 2016-11-24 19:20:20 -0600 | |
|---|---|---|
| committer | 2016-11-24 19:20:20 -0600 | |
| commit | dddc6dcce14aa88e15e12935dad48873d798b899 (patch) | |
| tree | fcabf025902df17ff1e5fc8ddae7394c0217c963 /src | |
| parent | a1698491fe1dd4afacd02dedaed97de95cf3cdac (diff) | |
| parent | 51f33cf106e99180aff696d74638fd8197faac24 (diff) | |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
| -rw-r--r-- | src/mame/drivers/rainbow.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/input/input_win32.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 40b29d3c3d1..21959f7f154 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -698,7 +698,7 @@ private: // GDC RESET MACRO - used in "machine_reset" & GDC_EXTRA_REGISTER_w ! #define GDC_RESET_MACRO \ -m_PORT50 = 0; \ \ +m_PORT50 = 0; \ m_GDC_INDIRECT_REGISTER = 0; \ m_GDC_MODE_REGISTER = 0; \ m_GDC_WRITE_MASK = 0; \ diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index edd378be25d..a4e00eec17f 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -14,12 +14,14 @@ // standard windows headers #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <tchar.h> #undef interface #undef min #undef max // MAME headers #include "emu.h" +#include "strconv.h" // MAMEOS headers #include "winmain.h" @@ -81,13 +83,15 @@ public: for (int keynum = 0; keynum < MAX_KEYS; keynum++) { input_item_id itemid = table.map_di_scancode_to_itemid(keynum); - char name[20]; + TCHAR keyname[100]; - // generate/fetch the name - _snprintf(name, ARRAY_LENGTH(name), "Scan%03d", keynum); + // generate the name + if (GetKeyNameText(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, ARRAY_LENGTH(keyname)) == 0) + _sntprintf(keyname, ARRAY_LENGTH(keyname), TEXT("Scan%03d"), keynum); + std::string name = osd::text::from_tstring(keyname); // add the item to the device - devinfo->device()->add_item(name, itemid, generic_button_get_state<std::uint8_t>, &devinfo->keyboard.state[keynum]); + devinfo->device()->add_item(name.c_str(), itemid, generic_button_get_state<std::uint8_t>, &devinfo->keyboard.state[keynum]); } } |
