diff options
author | smf- <smf-@users.noreply.github.com> | 2016-06-15 15:10:54 +0100 |
---|---|---|
committer | smf- <smf-@users.noreply.github.com> | 2016-06-15 15:11:36 +0100 |
commit | 2e51110ebf134da7dda12f375d00d7cbb7aa154b (patch) | |
tree | 5bf8e2f3c1e5487f2df6881e4a65c40865f762c7 | |
parent | 13526f680b58d04cb5351be2a8e7c3db2673666d (diff) |
The calling convention goes inside the brackets of pointers to functions. Allows compiling with MSVC (nw)
Revision: 58dc78b6eba373d88fe7ef68f9ce3c2c43e635d6
Author: Giuseppe Gorgoglione <gorgogsp@gmail.com>
Date: 28/05/2016 03:14:15
Message:
Introduce dynamic_module
This is a central cross-platform facility to dynamically bind functions from shared libraries.
Updated all OSD modules to use it.
-rw-r--r-- | src/osd/modules/diagnostics/diagnostics_win32.cpp | 18 | ||||
-rw-r--r-- | src/osd/modules/font/font_dwrite.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.h | 4 | ||||
-rw-r--r-- | src/osd/modules/input/input_rawinput.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/render/winglcontext.h | 16 |
5 files changed, 24 insertions, 24 deletions
diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 437b2b3ddb5..70e290240c2 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -28,15 +28,15 @@ #include <windows/winutil.h> // Typedefs for dynamically loaded functions -typedef BOOL WINAPI (*StackWalk64_fn)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64); -typedef BOOL WINAPI (*SymInitialize_fn)(HANDLE, LPCTSTR, BOOL); -typedef PVOID WINAPI (*SymFunctionTableAccess64_fn)(HANDLE, DWORD64); -typedef DWORD64 WINAPI (*SymGetModuleBase64_fn)(HANDLE, DWORD64); -typedef BOOL WINAPI (*SymFromAddr_fn)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO); -typedef BOOL WINAPI (*SymGetLineFromAddr64_fn)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64); -typedef PIMAGE_SECTION_HEADER WINAPI (*ImageRvaToSection_fn)(PIMAGE_NT_HEADERS, PVOID, ULONG); -typedef PIMAGE_NT_HEADERS WINAPI (*ImageNtHeader_fn)(PVOID); -typedef VOID WINAPI (*RtlCaptureContext_fn)(PCONTEXT); +typedef BOOL (WINAPI *StackWalk64_fn)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64); +typedef BOOL (WINAPI *SymInitialize_fn)(HANDLE, LPCTSTR, BOOL); +typedef PVOID (WINAPI *SymFunctionTableAccess64_fn)(HANDLE, DWORD64); +typedef DWORD64 (WINAPI *SymGetModuleBase64_fn)(HANDLE, DWORD64); +typedef BOOL (WINAPI *SymFromAddr_fn)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO); +typedef BOOL (WINAPI *SymGetLineFromAddr64_fn)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64); +typedef PIMAGE_SECTION_HEADER (WINAPI *ImageRvaToSection_fn)(PIMAGE_NT_HEADERS, PVOID, ULONG); +typedef PIMAGE_NT_HEADERS (WINAPI *ImageNtHeader_fn)(PVOID); +typedef VOID (WINAPI *RtlCaptureContext_fn)(PCONTEXT); class stack_walker { diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp index e816f296294..9c0bee36220 100644 --- a/src/osd/modules/font/font_dwrite.cpp +++ b/src/osd/modules/font/font_dwrite.cpp @@ -79,7 +79,7 @@ struct osd_deleter typedef std::unique_ptr<char, osd_deleter> osd_utf8_ptr; // Typedefs for dynamically loaded functions -typedef HRESULT WINAPI (*d2d_create_factory_fn)(D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **); +typedef HRESULT (WINAPI *d2d_create_factory_fn)(D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **); typedef HRESULT (*dwrite_create_factory_fn)(DWRITE_FACTORY_TYPE, REFIID, IUnknown **); // Debugging functions diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h index 7005ed0a305..5fc3dec30f6 100644 --- a/src/osd/modules/input/input_dinput.h +++ b/src/osd/modules/input/input_dinput.h @@ -45,9 +45,9 @@ public: // Typedef for dynamically loaded function #if DIRECTINPUT_VERSION >= 0x0800 -typedef HRESULT WINAPI (*dinput_create_fn)(HINSTANCE, DWORD, LPDIRECTINPUT8 *, LPUNKNOWN); +typedef HRESULT (WINAPI *dinput_create_fn)(HINSTANCE, DWORD, LPDIRECTINPUT8 *, LPUNKNOWN); #else -typedef HRESULT WINAPI (*dinput_create_fn)(HINSTANCE, DWORD, LPDIRECTINPUT *, LPUNKNOWN); +typedef HRESULT (WINAPI *dinput_create_fn)(HINSTANCE, DWORD, LPDIRECTINPUT *, LPUNKNOWN); #endif class dinput_api_helper diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index cfab7dcdb5a..c4f84642b2f 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -38,10 +38,10 @@ //============================================================ // Typedefs for dynamically loaded functions -typedef UINT WINAPI (*get_rawinput_device_list_ptr)(PRAWINPUTDEVICELIST, PUINT, UINT); -typedef UINT WINAPI (*get_rawinput_data_ptr)( HRAWINPUT, UINT, LPVOID, PUINT, UINT); -typedef UINT WINAPI (*get_rawinput_device_info_ptr)(HANDLE, UINT, LPVOID, PUINT); -typedef BOOL WINAPI (*register_rawinput_devices_ptr)(PCRAWINPUTDEVICE, UINT, UINT); +typedef UINT (WINAPI *get_rawinput_device_list_ptr)(PRAWINPUTDEVICELIST, PUINT, UINT); +typedef UINT (WINAPI *get_rawinput_data_ptr)( HRAWINPUT, UINT, LPVOID, PUINT, UINT); +typedef UINT (WINAPI *get_rawinput_device_info_ptr)(HANDLE, UINT, LPVOID, PUINT); +typedef BOOL (WINAPI *register_rawinput_devices_ptr)(PCRAWINPUTDEVICE, UINT, UINT); class safe_regkey { diff --git a/src/osd/modules/render/winglcontext.h b/src/osd/modules/render/winglcontext.h index 54e9a0ebae0..ec63b11ff72 100644 --- a/src/osd/modules/render/winglcontext.h +++ b/src/osd/modules/render/winglcontext.h @@ -17,14 +17,14 @@ #include "modules/lib/osdlib.h" // Typedefs for dynamically loaded functions -typedef PROC WINAPI (*wglGetProcAddress_fn)(LPCSTR); -typedef HGLRC WINAPI (*wglCreateContext_fn)(HDC); -typedef BOOL WINAPI (*wglDeleteContext_fn)(HGLRC); -typedef BOOL WINAPI (*wglMakeCurrent_fn)(HDC, HGLRC); - -typedef const char * WINAPI (*wglGetExtensionsStringEXT_fn)(void); -typedef BOOL WINAPI (*wglSwapIntervalEXT_fn)(int); -typedef int WINAPI (*wglGetSwapIntervalEXT_fn)(void); +typedef PROC (WINAPI *wglGetProcAddress_fn)(LPCSTR); +typedef HGLRC (WINAPI *wglCreateContext_fn)(HDC); +typedef BOOL (WINAPI *wglDeleteContext_fn)(HGLRC); +typedef BOOL (WINAPI *wglMakeCurrent_fn)(HDC, HGLRC); + +typedef const char * (WINAPI *wglGetExtensionsStringEXT_fn)(void); +typedef BOOL (WINAPI *wglSwapIntervalEXT_fn)(int); +typedef int (WINAPI *wglGetSwapIntervalEXT_fn)(void); class win_gl_context : public osd_gl_context { |