Commit 60c0f7e24358ff1ec0a5f46d986bb08dbe433817
2017-06-15T23:30:29
Fixed SDL_GetWindowWMInfo() returning success on three unsupported platforms.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/src/video/pandora/SDL_pandora.c b/src/video/pandora/SDL_pandora.c
index 4ccb08d..eff1a20 100644
--- a/src/video/pandora/SDL_pandora.c
+++ b/src/video/pandora/SDL_pandora.c
@@ -116,7 +116,9 @@ PND_create()
device->RestoreWindow = PND_restorewindow;
device->SetWindowGrab = PND_setwindowgrab;
device->DestroyWindow = PND_destroywindow;
+#if 0
device->GetWindowWMInfo = PND_getwindowwminfo;
+#endif
device->GL_LoadLibrary = PND_gl_loadlibrary;
device->GL_GetProcAddress = PND_gl_getprocaddres;
device->GL_UnloadLibrary = PND_gl_unloadlibrary;
@@ -298,6 +300,7 @@ PND_destroywindow(_THIS, SDL_Window * window)
/*****************************************************************************/
/* SDL Window Manager function */
/*****************************************************************************/
+#if 0
SDL_bool
PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
{
@@ -312,6 +315,7 @@ PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
/* Failed to get window manager information */
return SDL_FALSE;
}
+#endif
/*****************************************************************************/
/* SDL OpenGL/OpenGL ES functions */
diff --git a/src/video/psp/SDL_pspvideo.c b/src/video/psp/SDL_pspvideo.c
index 91ad248..754a24d 100644
--- a/src/video/psp/SDL_pspvideo.c
+++ b/src/video/psp/SDL_pspvideo.c
@@ -127,7 +127,9 @@ PSP_Create()
device->RestoreWindow = PSP_RestoreWindow;
device->SetWindowGrab = PSP_SetWindowGrab;
device->DestroyWindow = PSP_DestroyWindow;
+#if 0
device->GetWindowWMInfo = PSP_GetWindowWMInfo;
+#endif
device->GL_LoadLibrary = PSP_GL_LoadLibrary;
device->GL_GetProcAddress = PSP_GL_GetProcAddress;
device->GL_UnloadLibrary = PSP_GL_UnloadLibrary;
@@ -291,6 +293,7 @@ PSP_DestroyWindow(_THIS, SDL_Window * window)
/*****************************************************************************/
/* SDL Window Manager function */
/*****************************************************************************/
+#if 0
SDL_bool
PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
{
@@ -305,6 +308,7 @@ PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
/* Failed to get window manager information */
return SDL_FALSE;
}
+#endif
/* TO Write Me */
diff --git a/src/video/raspberry/SDL_rpivideo.c b/src/video/raspberry/SDL_rpivideo.c
index c5492e5..5320e70 100644
--- a/src/video/raspberry/SDL_rpivideo.c
+++ b/src/video/raspberry/SDL_rpivideo.c
@@ -111,7 +111,9 @@ RPI_Create()
device->RestoreWindow = RPI_RestoreWindow;
device->SetWindowGrab = RPI_SetWindowGrab;
device->DestroyWindow = RPI_DestroyWindow;
+#if 0
device->GetWindowWMInfo = RPI_GetWindowWMInfo;
+#endif
device->GL_LoadLibrary = RPI_GLES_LoadLibrary;
device->GL_GetProcAddress = RPI_GLES_GetProcAddress;
device->GL_UnloadLibrary = RPI_GLES_UnloadLibrary;
@@ -367,6 +369,7 @@ RPI_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
/*****************************************************************************/
/* SDL Window Manager function */
/*****************************************************************************/
+#if 0
SDL_bool
RPI_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
{
@@ -381,6 +384,7 @@ RPI_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
/* Failed to get window manager information */
return SDL_FALSE;
}
+#endif
#endif /* SDL_VIDEO_DRIVER_RPI */