Patched to compile.
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
diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m
index 971b438..68199da 100644
--- a/src/video/uikit/SDL_uikitappdelegate.m
+++ b/src/video/uikit/SDL_uikitappdelegate.m
@@ -451,10 +451,11 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh)
{
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;
}
diff --git a/src/video/windows/SDL_windowsmodes.c b/src/video/windows/SDL_windowsmodes.c
index 76eff0c..8c5cb2a 100644
--- a/src/video/windows/SDL_windowsmodes.c
+++ b/src/video/windows/SDL_windowsmodes.c
@@ -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 @@ WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
(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 @@ WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
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);
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
index ec282fa..312107a 100644
--- a/src/video/x11/SDL_x11modes.c
+++ b/src/video/x11/SDL_x11modes.c
@@ -1095,9 +1095,9 @@ X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rec
&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);
}