Patched to compile.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 05 Jan 2016 05:22:35 -0500
changeset 10031 2b3baddd9afa
parent 10030 061b1b467bd3
child 10032 e661304722ce
Patched to compile.
src/video/uikit/SDL_uikitappdelegate.m
src/video/windows/SDL_windowsmodes.c
src/video/x11/SDL_x11modes.c
--- a/src/video/uikit/SDL_uikitappdelegate.m	Tue Jan 05 02:29:16 2016 -0500
+++ b/src/video/uikit/SDL_uikitappdelegate.m	Tue Jan 05 05:22:35 2016 -0500
@@ -451,10 +451,11 @@
 {
     NSURL *fileURL = url.filePathURL;
     if (fileURL != nil) {
-        SDL_SendDropFile([fileURL.path UTF8String]);
+        SDL_SendDropFile(NULL, [fileURL.path UTF8String]);
     } else {
-        SDL_SendDropFile([url.absoluteString UTF8String]);
+        SDL_SendDropFile(NULL, [url.absoluteString UTF8String]);
     }
+    SDL_SendDropComplete(NULL);
     return YES;
 }
 
--- a/src/video/windows/SDL_windowsmodes.c	Tue Jan 05 02:29:16 2016 -0500
+++ b/src/video/windows/SDL_windowsmodes.c	Tue Jan 05 05:22:35 2016 -0500
@@ -23,6 +23,7 @@
 #if SDL_VIDEO_DRIVER_WINDOWS
 
 #include "SDL_windowsvideo.h"
+#include "../../../include/SDL_assert.h"
 
 /* Windows CE compatibility */
 #ifndef CDS_FULLSCREEN
@@ -342,7 +343,7 @@
         (LONG) (pDevMode->dmPosition.x + (pDevMode->dmPelsWidth / 2)),
         (LONG) (pDevMode->dmPosition.y + (pDevMode->dmPelsHeight / 2))
     };
-    HMONITOR hmon = MonitorFromPoint(&pt, MONITOR_DEFAULTTONULL);
+    HMONITOR hmon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL);
     MONITORINFO minfo;
     const RECT *work;
     BOOL rc = FALSE;
@@ -360,7 +361,7 @@
         return SDL_SetError("Couldn't find monitor data");
     }
 
-    work = &minfo->rcWork;
+    work = &minfo.rcWork;
     rect->x = (int)SDL_ceil(work->left * data->ScaleX);
     rect->y = (int)SDL_ceil(work->top * data->ScaleY);
     rect->w = (int)SDL_ceil((work->right - work->left) * data->ScaleX);
--- a/src/video/x11/SDL_x11modes.c	Tue Jan 05 02:29:16 2016 -0500
+++ b/src/video/x11/SDL_x11modes.c	Tue Jan 05 05:22:35 2016 -0500
@@ -1095,9 +1095,9 @@
                                     &real_type, &real_format, &items_read,
                                     &items_left, &propdata);
     if ((status == Success) && (items_read >= 4)) {
-        retval = 0;
         const long *p = (long*) propdata;
         const SDL_Rect usable = { (int)p[0], (int)p[1], (int)p[2], (int)p[3] };
+        retval = 0;
         if (!SDL_IntersectRect(rect, &usable, rect)) {
             SDL_zerop(rect);
         }