From bc4bbe79aa2172b0a987b0f198d21896b3cfe306 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 5 Dec 2017 14:26:41 -0500 Subject: [PATCH] don't define UNICODE at all, we don't need it and it causes dinput problems (names are wchar_t) --- gfx/drivers_context/wgl_ctx.c | 4 ---- input/drivers_joypad/dinput_joypad.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 64c4be8a09..39dbb26cdb 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -23,10 +23,6 @@ #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #endif -#if !defined(_MSC_VER) || _MSC_VER > 1400 -#define UNICODE -#endif - #include #include diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index 403a13a56a..b390e315cf 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -97,7 +97,7 @@ static void dinput_joypad_destroy(void) IDirectInputDevice8_Unacquire(g_pads[i].joypad); IDirectInputDevice8_Release(g_pads[i].joypad); } - + free(g_pads[i].joy_name); g_pads[i].joy_name = NULL; free(g_pads[i].joy_friendly_name);