Yet more Win64 tweaks
authorSam Lantinga <slouken@libsdl.org>
Tue, 07 Mar 2006 16:02:59 +0000
changeset 1481deb22b9fe970
parent 1480 0a2bd6507477
child 1482 141528317f4f
Yet more Win64 tweaks
src/video/wincommon/SDL_lowvideo.h
src/video/wincommon/SDL_syswm.c
     1.1 --- a/src/video/wincommon/SDL_lowvideo.h	Tue Mar 07 05:21:32 2006 +0000
     1.2 +++ b/src/video/wincommon/SDL_lowvideo.h	Tue Mar 07 16:02:59 2006 +0000
     1.3 @@ -39,6 +39,9 @@
     1.4  #ifndef GWLP_WNDPROC
     1.5  #define GWLP_WNDPROC	GWL_WNDPROC
     1.6  #endif
     1.7 +#ifndef GCLP_HICON
     1.8 +#define GCLP_HICON GCL_HICON
     1.9 +#endif
    1.10  
    1.11  #include "../SDL_sysvideo.h"
    1.12  
    1.13 @@ -118,7 +121,7 @@
    1.14  
    1.15  /* DJM: This is really from SDL_sysevents.c, we need it in
    1.16     GDL_CreateWindow as well */
    1.17 -LONG CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
    1.18 +LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
    1.19  
    1.20  /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */
    1.21  typedef int (WINAPI *ToUnicodeFN)(UINT, UINT, PBYTE, LPWSTR, int, UINT);
     2.1 --- a/src/video/wincommon/SDL_syswm.c	Tue Mar 07 05:21:32 2006 +0000
     2.2 +++ b/src/video/wincommon/SDL_syswm.c	Tue Mar 07 16:02:59 2006 +0000
     2.3 @@ -220,7 +220,7 @@
     2.4  	if ( screen_icn == NULL ) {
     2.5  		SDL_SetError("Couldn't create Win32 icon handle");
     2.6  	} else {
     2.7 -		SetClassLongPtr(SDL_Window, GCL_HICON, (LONG_PTR)screen_icn);
     2.8 +		SetClassLongPtr(SDL_Window, GCLP_HICON, (LONG_PTR)screen_icn);
     2.9  	}
    2.10  	SDL_stack_free(icon_win32);
    2.11  #endif /* DISABLE_ICON_SUPPORT */