From 24f41c8c4c85cc6c9eb1cea61d2ffe07ce526573 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 8 Nov 2015 15:32:25 +0100 Subject: [PATCH] Use only LoadLibraryA to match EGL backend --- src/wgl_context.c | 2 +- src/win32_init.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wgl_context.c b/src/wgl_context.c index 015c7040..70e7f6ea 100644 --- a/src/wgl_context.c +++ b/src/wgl_context.c @@ -275,7 +275,7 @@ int _glfwInitContextAPI(void) if (!_glfwCreateContextTLS()) return GLFW_FALSE; - _glfw.wgl.opengl32.instance = LoadLibraryW(L"opengl32.dll"); + _glfw.wgl.opengl32.instance = LoadLibraryA("opengl32.dll"); if (!_glfw.wgl.opengl32.instance) { _glfwInputError(GLFW_PLATFORM_ERROR, "WGL: Failed to load opengl32.dll"); diff --git a/src/win32_init.c b/src/win32_init.c index 3831a76d..6d0f90d8 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -62,7 +62,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) // static GLFWbool initLibraries(void) { - _glfw.win32.winmm.instance = LoadLibraryW(L"winmm.dll"); + _glfw.win32.winmm.instance = LoadLibraryA("winmm.dll"); if (!_glfw.win32.winmm.instance) { _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load winmm.dll"); @@ -78,7 +78,7 @@ static GLFWbool initLibraries(void) _glfw.win32.winmm.timeGetTime = (TIMEGETTIME_T) GetProcAddress(_glfw.win32.winmm.instance, "timeGetTime"); - _glfw.win32.user32.instance = LoadLibraryW(L"user32.dll"); + _glfw.win32.user32.instance = LoadLibraryA("user32.dll"); if (!_glfw.win32.user32.instance) { _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load user32.dll"); @@ -90,7 +90,7 @@ static GLFWbool initLibraries(void) _glfw.win32.user32.ChangeWindowMessageFilterEx = (CHANGEWINDOWMESSAGEFILTEREX_T) GetProcAddress(_glfw.win32.user32.instance, "ChangeWindowMessageFilterEx"); - _glfw.win32.dwmapi.instance = LoadLibraryW(L"dwmapi.dll"); + _glfw.win32.dwmapi.instance = LoadLibraryA("dwmapi.dll"); if (_glfw.win32.dwmapi.instance) { _glfw.win32.dwmapi.DwmIsCompositionEnabled = (DWMISCOMPOSITIONENABLED_T) @@ -99,7 +99,7 @@ static GLFWbool initLibraries(void) GetProcAddress(_glfw.win32.dwmapi.instance, "DwmFlush"); } - _glfw.win32.shcore.instance = LoadLibraryW(L"shcore.dll"); + _glfw.win32.shcore.instance = LoadLibraryA("shcore.dll"); if (_glfw.win32.shcore.instance) { _glfw.win32.shcore.SetProcessDPIAwareness = (SETPROCESSDPIAWARENESS_T)