mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-29 15:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use only LoadLibraryA to match EGL backend

Browse Source
This commit is contained in:
Camilla Berglund 2015-11-08 15:32:25 +01:00
parent dc1b9ce7f0
commit 24f41c8c4c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wgl_context.c
View File

@ -275,7 +275,7 @@ int _glfwInitContextAPI(void)
if (!_glfwCreateContextTLS()) if (!_glfwCreateContextTLS())
return GLFW_FALSE; return GLFW_FALSE;
_glfw.wgl.opengl32.instance = LoadLibraryW(L"opengl32.dll"); _glfw.wgl.opengl32.instance = LoadLibraryA("opengl32.dll");
if (!_glfw.wgl.opengl32.instance) if (!_glfw.wgl.opengl32.instance)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "WGL: Failed to load opengl32.dll"); _glfwInputError(GLFW_PLATFORM_ERROR, "WGL: Failed to load opengl32.dll");

8
src/win32_init.c
View File

@ -62,7 +62,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
// //
static GLFWbool initLibraries(void) static GLFWbool initLibraries(void)
{ {
_glfw.win32.winmm.instance = LoadLibraryW(L"winmm.dll"); _glfw.win32.winmm.instance = LoadLibraryA("winmm.dll");
if (!_glfw.win32.winmm.instance) if (!_glfw.win32.winmm.instance)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load winmm.dll"); _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load winmm.dll");
@ -78,7 +78,7 @@ static GLFWbool initLibraries(void)
_glfw.win32.winmm.timeGetTime = (TIMEGETTIME_T) _glfw.win32.winmm.timeGetTime = (TIMEGETTIME_T)
GetProcAddress(_glfw.win32.winmm.instance, "timeGetTime"); 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) if (!_glfw.win32.user32.instance)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load user32.dll"); _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to load user32.dll");
@ -90,7 +90,7 @@ static GLFWbool initLibraries(void)
_glfw.win32.user32.ChangeWindowMessageFilterEx = (CHANGEWINDOWMESSAGEFILTEREX_T) _glfw.win32.user32.ChangeWindowMessageFilterEx = (CHANGEWINDOWMESSAGEFILTEREX_T)
GetProcAddress(_glfw.win32.user32.instance, "ChangeWindowMessageFilterEx"); 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) if (_glfw.win32.dwmapi.instance)
{ {
_glfw.win32.dwmapi.DwmIsCompositionEnabled = (DWMISCOMPOSITIONENABLED_T) _glfw.win32.dwmapi.DwmIsCompositionEnabled = (DWMISCOMPOSITIONENABLED_T)
@ -99,7 +99,7 @@ static GLFWbool initLibraries(void)
GetProcAddress(_glfw.win32.dwmapi.instance, "DwmFlush"); 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) if (_glfw.win32.shcore.instance)
{ {
_glfw.win32.shcore.SetProcessDPIAwareness = (SETPROCESSDPIAWARENESS_T) _glfw.win32.shcore.SetProcessDPIAwareness = (SETPROCESSDPIAWARENESS_T)