commit 2b4c556cd0c9db2f074e98da90080b53f613a98a
author Camilla Berglund <elmindreda@elmindreda.org> Thu Nov 01 16:43:40 2012 +0100
committer Camilla Berglund <elmindreda@elmindreda.org> Thu Nov 01 16:43:40 2012 +0100
tree 22f5b474133706f884e33b1092cbe5901917923f
parent 4fc32a4bbf2f5402fb8fc83adfe48b96ce287496
parent a9d1fdfc44de37e9a4c2837cd75a56c4a0608826

Merge branch 'master' of github.com:elmindreda/glfw

src/win32_fullscreen.c

diff --git a/src/win32_fullscreen.c b/src/win32_fullscreen.c
index 35d7505..26740d1 100644
--- a/src/win32_fullscreen.c
+++ b/src/win32_fullscreen.c
@@ -43,7 +43,7 @@
                                      int* bpp, int* refreshRate,
                                      GLboolean exactBPP)
 {
-    int mode, bestWidth, bestHeight, bestBPP, bestRate;
+    int mode, bestWidth = 0, bestHeight = 0, bestBPP = 0, bestRate = 0;
     unsigned int sizeDiff, rateDiff, leastSizeDiff, leastRateDiff;
     GLboolean foundMode = GL_FALSE;
     DEVMODE dm;
@@ -130,7 +130,7 @@
     closestRate   = *refreshRate;
 
     if (getClosestVideoMode(&closestWidth, &closestHeight,
-                            &closestBPP, &closestRate, GL_FALSE))
+                            &closestBPP, &closestRate, exactBPP))
     {
         dm.dmSize = sizeof(DEVMODE);
         dm.dmFields     = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;

src/win32_input.c

diff --git a/src/win32_input.c b/src/win32_input.c
index a919583..2178b14 100644
--- a/src/win32_input.c
+++ b/src/win32_input.c
@@ -106,6 +106,8 @@
 
 void _glfwPlatformEnableSystemKeys(_GLFWwindow* window)
 {
+    UNREFERENCED_PARAMETER(window);
+
     if (_glfwLibrary.Win32.keyboardHook != NULL)
     {
         UnhookWindowsHookEx(_glfwLibrary.Win32.keyboardHook);
@@ -120,6 +122,8 @@
 
 void _glfwPlatformDisableSystemKeys(_GLFWwindow* window)
 {
+    UNREFERENCED_PARAMETER(window);
+
     _glfwLibrary.Win32.keyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
                                                        keyboardHook,
                                                        _glfwLibrary.Win32.instance,

src/win32_window.c

diff --git a/src/win32_window.c b/src/win32_window.c
index 6bb9509..75c8a8c 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -41,6 +41,7 @@
 
 static void hideCursor(_GLFWwindow* window)
 {
+    UNREFERENCED_PARAMETER(window);
 }
 
 
@@ -69,6 +70,8 @@
 
 static void showCursor(_GLFWwindow* window)
 {
+    UNREFERENCED_PARAMETER(window);
+
     // Un-capture cursor
     ReleaseCapture();