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] Remove SDL_LoadObject and SDL_LoadFunction calls in WIN_CreateDevice

sdl-windll-fix.patch (text/plain), 4.73 KB, created by Jason Francis on 2016-05-05 22:25:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Francis

Created: 2016-05-05 22:25:47 UTC

Size: 4.73 KB

patch

obsolete

>diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
>index bc4afe0..5d7e1fb 100644
>--- a/src/core/windows/SDL_windows.c
>+++ b/src/core/windows/SDL_windows.c
>@@ -124,6 +124,21 @@ BOOL WIN_IsWindowsVistaOrGreater()
> #endif
> }
> 
>+HMODULE WIN_LoadObject(const char *dllfile) {
>+    LPTSTR tstr = WIN_UTF8ToString(dllfile);
>+#ifdef __WINRT__
>+    /* WinRT only publically supports LoadPackagedLibrary() for loading .dll
>+       files.  LoadLibrary() is a private API, and not available for apps
>+       (that can be published to MS' Windows Store.)
>+    */
>+    HMODULE handle = LoadPackagedLibrary(tstr, 0);
>+#else
>+    HMODULE handle = LoadLibrary(tstr);
>+#endif
>+    SDL_free(tstr);
>+    return handle;
>+}
>+
> #endif /* __WIN32__ || __WINRT__ */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff --git a/src/core/windows/SDL_windows.h b/src/core/windows/SDL_windows.h
>index 0c99b03..af2a83e 100644
>--- a/src/core/windows/SDL_windows.h
>+++ b/src/core/windows/SDL_windows.h
>@@ -59,6 +59,9 @@ extern void WIN_CoUninitialize(void);
> /* Returns SDL_TRUE if we're running on Windows Vista and newer */
> extern BOOL WIN_IsWindowsVistaOrGreater();
> 
>+/* Dynamically loads a DLL and returns a pointer to the object handle */
>+extern HMODULE WIN_LoadObject(const char *dllfile);
>+
> #endif /* _INCLUDED_WINDOWS_H */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff --git a/src/loadso/windows/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c
>index bdb2b98..15fbccf 100644
>--- a/src/loadso/windows/SDL_sysloadso.c
>+++ b/src/loadso/windows/SDL_sysloadso.c
>@@ -32,17 +32,7 @@
> void *
> SDL_LoadObject(const char *sofile)
> {
>-    LPTSTR tstr = WIN_UTF8ToString(sofile);
>-#ifdef __WINRT__
>-    /* WinRT only publically supports LoadPackagedLibrary() for loading .dll
>-       files.  LoadLibrary() is a private API, and not available for apps
>-       (that can be published to MS' Windows Store.)
>-    */
>-    void *handle = (void *) LoadPackagedLibrary(tstr, 0);
>-#else
>-    void *handle = (void *) LoadLibrary(tstr);
>-#endif
>-    SDL_free(tstr);
>+    void *handle = (void *) WIN_LoadObject(sofile);
> 
>     /* Generate an error message if all loads failed */
>     if (handle == NULL) {
>diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
>index 3719980..c6eee24 100644
>--- a/src/video/windows/SDL_windowsvideo.c
>+++ b/src/video/windows/SDL_windowsvideo.c
>@@ -86,6 +86,7 @@ WIN_DeleteDevice(SDL_VideoDevice * device)
>     SDL_free(device);
> }
> 
>+
> static SDL_VideoDevice *
> WIN_CreateDevice(int devindex)
> {
>@@ -108,16 +109,16 @@ WIN_CreateDevice(int devindex)
>     }
>     device->driverdata = data;
> 
>-    data->userDLL = SDL_LoadObject("USER32.DLL");
>+    data->userDLL = WIN_LoadObject("USER32.DLL");
>     if (data->userDLL) {
>-        data->CloseTouchInputHandle = (BOOL (WINAPI *)(HTOUCHINPUT)) SDL_LoadFunction(data->userDLL, "CloseTouchInputHandle");
>-        data->GetTouchInputInfo = (BOOL (WINAPI *)(HTOUCHINPUT, UINT, PTOUCHINPUT, int)) SDL_LoadFunction(data->userDLL, "GetTouchInputInfo");
>-        data->RegisterTouchWindow = (BOOL (WINAPI *)(HWND, ULONG)) SDL_LoadFunction(data->userDLL, "RegisterTouchWindow");
>+        data->CloseTouchInputHandle = (BOOL (WINAPI *)(HTOUCHINPUT)) GetProcAddress(data->userDLL, "CloseTouchInputHandle");
>+        data->GetTouchInputInfo = (BOOL (WINAPI *)(HTOUCHINPUT, UINT, PTOUCHINPUT, int)) GetProcAddress(data->userDLL, "GetTouchInputInfo");
>+        data->RegisterTouchWindow = (BOOL (WINAPI *)(HWND, ULONG)) GetProcAddress(data->userDLL, "RegisterTouchWindow");
>     }
> 
>-    data->shcoreDLL = SDL_LoadObject("SHCORE.DLL");
>+    data->shcoreDLL = WIN_LoadObject("SHCORE.DLL");
>     if (data->shcoreDLL) {
>-        data->GetDpiForMonitor = (HRESULT (WINAPI *)(HMONITOR, MONITOR_DPI_TYPE, UINT *, UINT *)) SDL_LoadFunction(data->shcoreDLL, "GetDpiForMonitor");
>+        data->GetDpiForMonitor = (HRESULT (WINAPI *)(HMONITOR, MONITOR_DPI_TYPE, UINT *, UINT *)) GetProcAddress(data->shcoreDLL, "GetDpiForMonitor");
>     }
> 
>     /* Set the function pointers */
>diff --git a/src/video/windows/SDL_windowsvideo.h b/src/video/windows/SDL_windowsvideo.h
>index 912d876..6cdc1ed 100644
>--- a/src/video/windows/SDL_windowsvideo.h
>+++ b/src/video/windows/SDL_windowsvideo.h
>@@ -130,12 +130,12 @@ typedef struct SDL_VideoData
>     DWORD clipboard_count;
> 
>     /* Touch input functions */
>-    void* userDLL;
>+    HMODULE userDLL;
>     BOOL (WINAPI *CloseTouchInputHandle)( HTOUCHINPUT );
>     BOOL (WINAPI *GetTouchInputInfo)( HTOUCHINPUT, UINT, PTOUCHINPUT, int );
>     BOOL (WINAPI *RegisterTouchWindow)( HWND, ULONG );
> 
>-    void* shcoreDLL;
>+    HMODULE shcoreDLL;
>     HRESULT (WINAPI *GetDpiForMonitor)( HMONITOR         hmonitor,
>                                         MONITOR_DPI_TYPE dpiType,
>                                         UINT             *dpiX,

Actions: View | Diff

Attachments on bug 3321: 2446 | 2447

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.