From b50b6ff05ba495b65ed372f1b7bcaefb08c54699 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 31 Jan 2006 15:30:42 +0000 Subject: [PATCH] Date: Tue, 05 Jul 2005 21:43:26 +1000 From: Sean Childs Subject: [SDL] Compiling SDL 1.2.8 with the free Borland compiler When compiling SDL 1.2.8 with the free Borland compiler, I received this error (there is a similar error that occurs in src\video\windx5\sdl_dx5events.c): Error E2342 ..\..\src\video\windib\sdl_dibevents.c 189: Type mismatch in parameter 'lpPrevWndFunc' (wanted 'int (__stdcall *)()', got 'long (__stdcall *)(void *,unsigned int,unsigned int,long)') in function DIB_HandleMessage I checked the MSDN library at: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/ windowsuserinterface/windowing/windowprocedures/windowprocedurereference/wind owprocedurefunctions/callwindowproc.asp and it had this to say: If STRICT is not defined, the lpPrevWndFunc parameter has the data type FARPROC. The FARPROC type is declared as follows: int (FAR WINAPI * FARPROC) () In C, the FARPROC declaration indicates a callback function that has an unspecified parameter list. In C++, however, the empty parameter list in the declaration indicates that a function has no parameters. This subtle distinction can break careless code. Following is one way to handle this situation: #ifdef STRICT WNDPROC MyWindowProcedure #else FARPROC MyWindowProcedure #endif ... lResult = CallWindowProc(MyWindowProcedure, ...) --- src/video/windib/SDL_dibevents.c | 9 +++++++-- src/video/windx5/SDL_dx5events.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c index 979ad6da5..a3954c813 100644 --- a/src/video/windib/SDL_dibevents.c +++ b/src/video/windib/SDL_dibevents.c @@ -56,7 +56,12 @@ static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, in /* DJM: If the user setup the window for us, we want to save his window proc, and give him a chance to handle some messages. */ -static WNDPROC userWindowProc = NULL; +#ifdef STRICT +#define WNDPROCTYPE WNDPROC +#else +#define WNDPROCTYPE FARPROC +#endif +static WNDPROCTYPE userWindowProc = NULL; #ifdef _WIN32_WCE @@ -427,7 +432,7 @@ int DIB_CreateWindow(_THIS) /* DJM: we want all event's for the user specified window to be handled by SDL. */ - userWindowProc = (WNDPROC)GetWindowLong(SDL_Window, GWL_WNDPROC); + userWindowProc = (WNDPROCTYPE)GetWindowLong(SDL_Window, GWL_WNDPROC); SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)WinMessage); } else { SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index 478d45a90..6bd916b7a 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -66,7 +66,12 @@ static SDL_keysym *TranslateKey(UINT scancode, SDL_keysym *keysym, int pressed); /* DJM: If the user setup the window for us, we want to save his window proc, and give him a chance to handle some messages. */ -static WNDPROC userWindowProc = NULL; +#ifdef STRICT +#define WNDPROCTYPE WNDPROC +#else +#define WNDPROCTYPE FARPROC +#endif +static WNDPROCTYPE userWindowProc = NULL; static HWND GetTopLevelParent(HWND hWnd) { @@ -871,7 +876,7 @@ int DX5_CreateWindow(_THIS) /* DJM: we want all event's for the user specified window to be handled by SDL. */ - userWindowProc = (WNDPROC)GetWindowLong(SDL_Window, GWL_WNDPROC); + userWindowProc = (WNDPROCTYPE)GetWindowLong(SDL_Window, GWL_WNDPROC); SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)WinMessage); } else { SDL_Window = CreateWindow(SDL_Appname, SDL_Appname,