Date: Thu, 18 Sep 2003 14:24:35 -0400

From: Scott Watson
Subject: [SDL] Improper Windows message routine calling

If this hasn't been caught yet, there's an improper method of calling a
user's window message routine in the various SDL_xxevents.c files.

Calling it improperly can cause a crash under at least XP.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40722

src/video/windib/SDL_dibevents.c

@@ -177,7 +177,7 @@ LONG
 				along to any win32 specific window proc.
 			 */
 			} else if (userWindowProc) {
-				return userWindowProc(hwnd, msg, wParam, lParam);
+				return CallWindowProc(userWindowProc, hwnd, msg, wParam, lParam);
 			}
 		}
 		break;

src/video/windx5/SDL_dx5events.c

@@ -537,13 +537,13 @@ LONG
 				wmmsg.lParam = lParam;
 				posted = SDL_PrivateSysWMEvent(&wmmsg);
 
-         /* DJM: If the user isn't watching for private messages in her
-            SDL event loop, then pass it along to any win32 specific
-            window proc.
-          */
-         } else if (userWindowProc) {
-            return userWindowProc(hwnd, msg, wParam, lParam);
-         }
+			/* DJM: If the user isn't watching for private
+				messages in her SDL event loop, then pass it
+				along to any win32 specific window proc.
+			 */
+			} else if (userWindowProc) {
+				return CallWindowProc(userWindowProc, hwnd, msg, wParam, lParam);
+			}
 		}
 		break;
 	}