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] updated patch

3816.patch (text/plain), 3.44 KB, created by Ozkan Sezer on 2021-01-27 12:26:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2021-01-27 12:26:08 UTC

Size: 3.44 KB

patch

obsolete

>diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
>--- a/src/video/SDL_stretch.c
>+++ b/src/video/SDL_stretch.c
>@@ -41,25 +41,34 @@
>  * value after the first scanline. */
> /* This bug seems fixed, at least with gcc >= 4.6 */
> #  define USE_ASM_STRETCH
>-#  if defined(__GNUC__)
>+#  if !(defined(_MSC_VER) || defined(__WATCOMC__))
> #    if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
> #      undef USE_ASM_STRETCH
> #    endif
> #  endif
> /* But it doesn't work if mprotect isn't available */
>-#  if !defined(HAVE_MPROTECT) && defined(USE_ASM_STRETCH)
>+#  if !defined(HAVE_MPROTECT) && !(defined(__WIN32__) || defined(__OS2__))
> #    undef USE_ASM_STRETCH
> #  endif
> #endif
> 
> #ifdef USE_ASM_STRETCH
> 
>-#ifdef HAVE_MPROTECT
>+#ifdef __WIN32__
>+#define WIN32_LEAN_AND_MEAN
>+#include <windows.h>
>+#elif defined (__OS2__)
>+#define INCL_DOSMEMMGR
>+#define INCL_DOSERRORS
>+#include <os2.h>
>+#elif defined(HAVE_MPROTECT)
> #include <sys/types.h>
> #include <sys/mman.h>
> #endif
> #ifdef __GNUC__
> #define PAGE_ALIGNED __attribute__((__aligned__(4096)))
>+#elif defined(_MSC_VER)
>+#define PAGE_ALIGNED __declspec(align(4096))
> #else
> #define PAGE_ALIGNED
> #endif
>@@ -75,13 +84,12 @@
> #error Need assembly opcodes for this architecture
> #endif
> 
>-static unsigned char copy_row[4096] PAGE_ALIGNED;
>+static PAGE_ALIGNED unsigned char copy_row[4096];
> 
> static int
> generate_rowbytes(int src_w, int dst_w, int bpp)
> {
>-    static struct
>-    {
>+    static struct {
>         int bpp;
>         int src_w;
>         int dst_w;
>@@ -92,6 +100,9 @@ generate_rowbytes(int src_w, int dst_w, 
>     int pos, inc;
>     unsigned char *eip, *fence;
>     unsigned char load, store;
>+#ifdef __WIN32__
>+    DWORD oldprot;
>+#endif
> 
>     /* See if we need to regenerate the copy buffer */
>     if ((src_w == last.src_w) && (dst_w == last.dst_w) && (bpp == last.bpp)) {
>@@ -115,8 +126,16 @@ generate_rowbytes(int src_w, int dst_w, 
>     default:
>         return SDL_SetError("ASM stretch of %d bytes isn't supported", bpp);
>     }
>-#ifdef HAVE_MPROTECT
>     /* Make the code writeable */
>+#ifdef __WIN32__
>+    if (!VirtualProtect(copy_row, sizeof(copy_row), PAGE_READWRITE, &oldprot)) {
>+        return SDL_SetError("Couldn't make copy buffer writeable");
>+    }
>+#elif defined (__OS2__)
>+    if (DosSetMem(copy_row, sizeof(copy_row), PAG_READ | PAG_WRITE) != NO_ERROR) {
>+        return SDL_SetError("Couldn't make copy buffer writeable");
>+    }
>+#elif defined(HAVE_MPROTECT)
>     if (mprotect(copy_row, sizeof(copy_row), PROT_READ | PROT_WRITE) < 0) {
>         return SDL_SetError("Couldn't make copy buffer writeable");
>     }
>@@ -147,8 +166,16 @@ generate_rowbytes(int src_w, int dst_w, 
>     }
>     *eip++ = RETURN;
> 
>-#ifdef HAVE_MPROTECT
>     /* Make the code executable but not writeable */
>+#ifdef __WIN32__
>+    if (!VirtualProtect(copy_row, sizeof(copy_row), PAGE_EXECUTE_READ, &oldprot)) {
>+        return SDL_SetError("Couldn't make copy buffer executable");
>+    }
>+#elif defined (__OS2__)
>+    if (DosSetMem(copy_row, sizeof(copy_row), PAG_READ | PAG_EXECUTE) != NO_ERROR) {
>+        return SDL_SetError("Couldn't make copy buffer executable");
>+    }
>+#elif defined(HAVE_MPROTECT)
>     if (mprotect(copy_row, sizeof(copy_row), PROT_READ | PROT_EXEC) < 0) {
>         return SDL_SetError("Couldn't make copy buffer executable");
>     }
>@@ -156,7 +183,6 @@ generate_rowbytes(int src_w, int dst_w, 
>     last.status = 0;
>     return (0);
> }
>-
> #endif /* USE_ASM_STRETCH */
> 
> #define DEFINE_COPY_ROW(name, type)         \

Actions: View | Diff

Attachments on bug 3816: 4711 | 4712 | 4713 | 4714 | 4715 | 4716 | 4717 | 4718 | 4719 | 4720 | 4721 | 4722

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.