We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch to use ToUnicode() directly if compiled for _WIN64

SDL_ToUnicode-w64.patch (text/plain), 2.47 KB, created by Ozkan Sezer on 2011-09-25 04:55:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2011-09-25 04:55:53 UTC

Size: 2.47 KB

patch

obsolete

>diff -urp SDL-1.2-20110921/src/video/wincommon/SDL_lowvideo.h SDL-1.2/src/video/wincommon/SDL_lowvideo.h
>--- SDL-1.2-20110921/src/video/wincommon/SDL_lowvideo.h	2011-09-25 08:33:38.000000000 +0300
>+++ SDL-1.2/src/video/wincommon/SDL_lowvideo.h	2011-09-25 14:34:46.000000000 +0300
>@@ -140,9 +140,13 @@ extern void DX5_SoundFocus(HWND window);
>    GDL_CreateWindow as well */
> LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
> 
>+#ifdef _WIN64
>+#define SDL_ToUnicode  ToUnicode
>+#else
> /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */
> typedef int (WINAPI *ToUnicodeFN)(UINT, UINT, const BYTE *, LPWSTR, int, UINT);
> 
> extern ToUnicodeFN SDL_ToUnicode;
>+#endif
> 
> #endif /* SDL_lowvideo_h */
>diff -urp SDL-1.2-20110921/src/video/wincommon/SDL_sysevents.c SDL-1.2/src/video/wincommon/SDL_sysevents.c
>--- SDL-1.2-20110921/src/video/wincommon/SDL_sysevents.c	2011-09-25 08:33:38.000000000 +0300
>+++ SDL-1.2/src/video/wincommon/SDL_sysevents.c	2011-09-25 14:31:59.000000000 +0300
>@@ -95,6 +95,7 @@ void (*WIN_WinPAINT)(_THIS, HDC hdc);
> extern void DIB_SwapGamma(_THIS);
> 
> #ifndef NO_GETKEYBOARDSTATE
>+#ifndef _WIN64
> /* Variables and support functions for SDL_ToUnicode() */
> static int codepage;
> static int Is9xME();
>@@ -102,6 +103,7 @@ static int GetCodePage();
> static int WINAPI ToUnicode9xME(UINT vkey, UINT scancode, const BYTE *keystate, LPWSTR wchars, int wsize, UINT flags);
> 
> ToUnicodeFN SDL_ToUnicode = ToUnicode9xME;
>+#endif
> #endif /* !NO_GETKEYBOARDSTATE */
> 
> 
>@@ -650,9 +652,10 @@ this->hidden->hiresFix, &x, &y);
> 		return(0);
> 
> #ifndef NO_GETKEYBOARDSTATE
>-		case WM_INPUTLANGCHANGE: {
>+		case WM_INPUTLANGCHANGE:
>+#ifndef _WIN64
> 			codepage = GetCodePage();
>-		}
>+#endif
> 		return(TRUE);
> #endif
> 
>@@ -760,6 +763,7 @@ int SDL_RegisterApp(char *name, Uint32 s
> #endif /* WM_MOUSELEAVE */
> 
> #ifndef NO_GETKEYBOARDSTATE
>+#ifndef _WIN64
> 	/* Initialise variables for SDL_ToUnicode() */
> 	codepage = GetCodePage();
> 
>@@ -767,6 +771,7 @@ int SDL_RegisterApp(char *name, Uint32 s
> 	   const issue here... */
> 	SDL_ToUnicode = Is9xME() ? ToUnicode9xME : (ToUnicodeFN) ToUnicode;
> #endif
>+#endif /* NO_GETKEYBOARDSTATE */
> 
> 	app_registered = 1;
> 	return(0);
>@@ -793,6 +798,7 @@ void SDL_UnregisterApp()
> }
> 
> #ifndef NO_GETKEYBOARDSTATE
>+#ifndef _WIN64
> /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */
> 
> static int Is9xME()
>@@ -829,5 +835,5 @@ static int WINAPI ToUnicode9xME(UINT vke
> 	}
> 	return 0;
> }
>-
>+#endif
> #endif /* !NO_GETKEYBOARDSTATE */

Actions: View | Diff

Attachments on bug 1310: 707

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.