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.

Move Windows::Foundation::Initialize to SDL2.dll, from SDL_main

file_3909.txt (text/plain), 1.64 KB, created by Ethan Lee on 2017-10-22 17:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ethan Lee

Created: 2017-10-22 17:45:36 UTC

Size: 1.64 KB

patch

obsolete

># HG changeset patch
># User Ethan Lee <flibitijibibo@flibitijibibo.com>
># Date 1508693884 14400
>#      Sun Oct 22 13:38:04 2017 -0400
># Node ID a13d377f76477c9859bac8a8773b7d5ee4384850
># Parent  05ff2be7e0d5f4d57d87f0323dc1d783480d794b
>WinRT: Move Windows::Foundation::Initialize to SDL2.dll, from SDL_main.
>
>This allows C# UWP applications to use SDL2's SDL_WinRTRunApp function.
>
>diff -r 05ff2be7e0d5 -r a13d377f7647 src/core/winrt/SDL_winrtapp_common.cpp
>--- a/src/core/winrt/SDL_winrtapp_common.cpp	Sat Oct 21 22:26:24 2017 -0700
>+++ b/src/core/winrt/SDL_winrtapp_common.cpp	Sun Oct 22 13:38:04 2017 -0400
>@@ -24,6 +24,8 @@
> #include "SDL_winrtapp_direct3d.h"
> #include "SDL_winrtapp_xaml.h"
> 
>+#include <wrl.h>
>+
> int (*WINRT_SDLAppEntryPoint)(int, char **) = NULL;
> 
> extern "C" DECLSPEC int
>@@ -32,6 +34,9 @@
>     if (xamlBackgroundPanel) {
>         return SDL_WinRTInitXAMLApp(mainFunction, xamlBackgroundPanel);
>     } else {
>+        if (FAILED(Windows::Foundation::Initialize(RO_INIT_MULTITHREADED))) {
>+            return 1;
>+        }
>         return SDL_WinRTInitNonXAMLApp(mainFunction);
>     }
> }
>diff -r 05ff2be7e0d5 -r a13d377f7647 src/main/winrt/SDL_winrt_main_NonXAML.cpp
>--- a/src/main/winrt/SDL_winrt_main_NonXAML.cpp	Sat Oct 21 22:26:24 2017 -0700
>+++ b/src/main/winrt/SDL_winrt_main_NonXAML.cpp	Sun Oct 22 13:38:04 2017 -0400
>@@ -50,10 +50,5 @@
> 
> int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
> {
>-    if (FAILED(Windows::Foundation::Initialize(RO_INIT_MULTITHREADED))) {
>-        return 1;
>-    }
>-
>-    SDL_WinRTRunApp(SDL_main, NULL);
>-    return 0;
>+    return SDL_WinRTRunApp(SDL_main, NULL);
> }

Actions: View

Attachments on bug 3909: 3026

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.