X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_main_mswin.c;h=656ae5143e1d065a121fff4fbed63b4b0c962b09;hb=93011e4f079bbfdb796c7b7f524f247956cc4830;hp=85492f7e70412f665a5ec73ea80b972b5e0300df;hpb=a7362e5d688d2d2873d6bab49b86302aa588f1bf;p=freeglut

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index 85492f7..656ae51 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -811,8 +811,9 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
     case WM_MOUSEWHEEL:
     {
         SFG_Window *child_window = NULL;
-        int wheel_number = LOWORD( wParam );
-        short ticks = ( short )HIWORD( wParam );
+        int wheel_number = 0;   /* Only one scroll wheel on windows */
+        /* int GET_KEYSTATE_WPARAM( wParam ); */
+        short ticks = GET_WHEEL_DELTA_WPARAM( wParam );
 
         window = fghWindowUnderCursor(window);
 
@@ -865,6 +866,8 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
 
             fgState.Modifiers = INVALID_MODIFIERS;
 		}
+        /* Per docs, should return zero */
+        lRet = 0;
     }
     break ;