Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update name of DYNAMIC_API macros (nw)

Browse Source
This commit is contained in:
Brad Hughes 2016-12-01 13:35:58 -05:00
parent a10fcd31d3
commit 6acd017c3f
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/osd/modules/font/font_dwrite.cpp
View File

@ -81,16 +81,16 @@ HRESULT SaveBitmap(IWICBitmap* bitmap, GUID pixelFormat, const WCHAR *filename)
ComPtr<IDWriteFactory> dwriteFactory;
ComPtr<IWICImagingFactory> wicFactory;
DYNAMIC_API(dwrite, "dwrite.dll");
DYNAMIC_API(d2d1, "d2d1.dll");
DYNAMIC_API_FN(dwrite, HRESULT, WINAPI, DWriteCreateFactory, DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
DYNAMIC_API_FN(d2d1, HRESULT, WINAPI, D2D1CreateFactory, D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **);
OSD_DYNAMIC_API(dwrite, "dwrite.dll");
OSD_DYNAMIC_API(d2d1, "d2d1.dll");
OSD_DYNAMIC_API_FN(dwrite, HRESULT, WINAPI, DWriteCreateFactory, DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
OSD_DYNAMIC_API_FN(d2d1, HRESULT, WINAPI, D2D1CreateFactory, D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **);
if (!DYNAMIC_API_TEST(D2D1CreateFactory) || !DYNAMIC_API_TEST(DWriteCreateFactory))
if (!OSD_DYNAMIC_API_TEST(D2D1CreateFactory) || !OSD_DYNAMIC_API_TEST(DWriteCreateFactory))
return ERROR_DLL_NOT_FOUND;
// Create a Direct2D factory
HR_RETHR(DYNAMIC_CALL(D2D1CreateFactory,
HR_RETHR(OSD_DYNAMIC_CALL(D2D1CreateFactory,
D2D1_FACTORY_TYPE_SINGLE_THREADED,
__uuidof(ID2D1Factory1),
nullptr,
@ -100,7 +100,7 @@ HRESULT SaveBitmap(IWICBitmap* bitmap, GUID pixelFormat, const WCHAR *filename)
CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
// Create a DirectWrite factory.
HR_RETHR(DYNAMIC_CALL(DWriteCreateFactory,
HR_RETHR(OSD_DYNAMIC_CALL(DWriteCreateFactory,
DWRITE_FACTORY_TYPE_SHARED,
__uuidof(IDWriteFactory),
reinterpret_cast<IUnknown **>(dwriteFactory.GetAddressOf())));
@ -647,12 +647,12 @@ private:
class font_dwrite : public osd_module, public font_module
{
private:
DYNAMIC_API(dwrite, "dwrite.dll");
DYNAMIC_API(d2d1, "d2d1.dll");
DYNAMIC_API(locale, "kernel32.dll");
DYNAMIC_API_FN(dwrite, HRESULT, WINAPI, DWriteCreateFactory, DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
DYNAMIC_API_FN(d2d1, HRESULT, WINAPI, D2D1CreateFactory, D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **);
DYNAMIC_API_FN(locale, int, WINAPI, GetUserDefaultLocaleName, LPWSTR, int);
OSD_DYNAMIC_API(dwrite, "dwrite.dll");
OSD_DYNAMIC_API(d2d1, "d2d1.dll");
OSD_DYNAMIC_API(locale, "kernel32.dll");
OSD_DYNAMIC_API_FN(dwrite, HRESULT, WINAPI, DWriteCreateFactory, DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
OSD_DYNAMIC_API_FN(d2d1, HRESULT, WINAPI, D2D1CreateFactory, D2D1_FACTORY_TYPE, REFIID, const D2D1_FACTORY_OPTIONS *, void **);
OSD_DYNAMIC_API_FN(locale, int, WINAPI, GetUserDefaultLocaleName, LPWSTR, int);
ComPtr<ID2D1Factory> m_d2dfactory;
ComPtr<IDWriteFactory> m_dwriteFactory;
ComPtr<IWICImagingFactory> m_wicFactory;
@ -670,7 +670,7 @@ public:
virtual bool probe() override
{
// This module is available if it can load the expected API Functions
if (!DYNAMIC_API_TEST(D2D1CreateFactory) || !DYNAMIC_API_TEST(DWriteCreateFactory))
if (!OSD_DYNAMIC_API_TEST(D2D1CreateFactory) || !OSD_DYNAMIC_API_TEST(DWriteCreateFactory))
return false;
return true;
@ -683,16 +683,16 @@ public:
osd_printf_verbose("FontProvider: Initializing DirectWrite\n");
// Make sure we can initialize our api functions
if (!DYNAMIC_API_TEST(D2D1CreateFactory) || !DYNAMIC_API_TEST(DWriteCreateFactory))
if (!OSD_DYNAMIC_API_TEST(D2D1CreateFactory) || !OSD_DYNAMIC_API_TEST(DWriteCreateFactory))
{
osd_printf_error("ERROR: FontProvider: Failed to load DirectWrite functions.\n");
return -1;
}
assert(DYNAMIC_API_TEST(GetUserDefaultLocaleName));
assert(OSD_DYNAMIC_API_TEST(GetUserDefaultLocaleName));
// Create a Direct2D factory.
HR_RET1(DYNAMIC_CALL(D2D1CreateFactory,
HR_RET1(OSD_DYNAMIC_CALL(D2D1CreateFactory,
D2D1_FACTORY_TYPE_SINGLE_THREADED,
__uuidof(ID2D1Factory),
nullptr,
@ -702,7 +702,7 @@ public:
CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
// Create a DirectWrite factory.
HR_RET1(DYNAMIC_CALL(DWriteCreateFactory,
HR_RET1(OSD_DYNAMIC_CALL(DWriteCreateFactory,
DWRITE_FACTORY_TYPE_SHARED,
__uuidof(IDWriteFactory),
reinterpret_cast<IUnknown **>(m_dwriteFactory.GetAddressOf())));
@ -791,10 +791,10 @@ private:
// Get the default locale for this user if possible.
// GetUserDefaultLocaleName doesn't exist on XP, so don't assume.
if (DYNAMIC_API_TEST(GetUserDefaultLocaleName))
if (OSD_DYNAMIC_API_TEST(GetUserDefaultLocaleName))
{
wchar_t name_buffer[LOCALE_NAME_MAX_LENGTH];
int len = DYNAMIC_CALL(GetUserDefaultLocaleName, name_buffer, LOCALE_NAME_MAX_LENGTH);
int len = OSD_DYNAMIC_CALL(GetUserDefaultLocaleName, name_buffer, LOCALE_NAME_MAX_LENGTH);
if (len != 0)
locale_name = name_buffer;
}

18
src/osd/modules/lib/osdlib.h
View File

@ -102,7 +102,7 @@ protected:
//=========================================================================================================
// Dynamic API helpers. Useful in creating a class members that expose dynamically bound API functions.
//
// DYNAMIC_API(dxgi, "dxgi.dll")
// OSD_DYNAMIC_API(dxgi, "dxgi.dll")
// DYNAMIC_API_FN(dxgi, DWORD, WINAPI, CreateDXGIFactory1, REFIID, void**)
//
// Calling then looks like: DYNAMIC_CALL(CreateDXGIFactory1, p1, p2, etc)
@ -110,17 +110,17 @@ protected:
#if !defined(OSD_UWP)
#define DYNAMIC_API(apiname, ...) osd::dynamic_module::ptr m_##apiname##module = osd::dynamic_module::open( { __VA_ARGS__ } )
#define DYNAMIC_API_FN(apiname, ret, conv, fname, ...) ret(conv *m_##fname##_pfn)( __VA_ARGS__ ) = m_##apiname##module->bind<ret(conv *)( __VA_ARGS__ )>(#fname)
#define DYNAMIC_CALL(fname, ...) (*m_##fname##_pfn) ( __VA_ARGS__ )
#define DYNAMIC_API_TEST(fname) (m_##fname##_pfn != nullptr)
#define OSD_DYNAMIC_API(apiname, ...) osd::dynamic_module::ptr m_##apiname##module = osd::dynamic_module::open( { __VA_ARGS__ } )
#define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...) ret(conv *m_##fname##_pfn)( __VA_ARGS__ ) = m_##apiname##module->bind<ret(conv *)( __VA_ARGS__ )>(#fname)
#define OSD_DYNAMIC_CALL(fname, ...) (*m_##fname##_pfn) ( __VA_ARGS__ )
#define OSD_DYNAMIC_API_TEST(fname) (m_##fname##_pfn != nullptr)
#else
#define DYNAMIC_API(apiname, ...)
#define DYNAMIC_API_FN(apiname, ret, conv, fname, ...)
#define DYNAMIC_CALL(fname, ...) fname( __VA_ARGS__ )
#define DYNAMIC_API_TEST(fname) (true)
#define OSD_DYNAMIC_API(apiname, ...)
#define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...)
#define OSD_DYNAMIC_CALL(fname, ...) fname( __VA_ARGS__ )
#define OSD_DYNAMIC_API_TEST(fname) (true)
#endif

8
src/osd/modules/monitor/monitor_dxgi.cpp
View File

@ -58,8 +58,8 @@ public:
class dxgi_monitor_module : public monitor_module_base
{
private:
DYNAMIC_API(dxgi, "dxgi.dll");
DYNAMIC_API_FN(dxgi, DWORD, WINAPI, CreateDXGIFactory1, REFIID, void**);
OSD_DYNAMIC_API(dxgi, "dxgi.dll");
OSD_DYNAMIC_API_FN(dxgi, DWORD, WINAPI, CreateDXGIFactory1, REFIID, void**);
public:
dxgi_monitor_module()
: monitor_module_base(OSD_MONITOR_PROVIDER, "dxgi")
@ -68,7 +68,7 @@ public:
bool probe() override
{
if(!DYNAMIC_API_TEST(CreateDXGIFactory1))
if(!OSD_DYNAMIC_API_TEST(CreateDXGIFactory1))
return false;
return true;
@ -128,7 +128,7 @@ protected:
ComPtr<IDXGIFactory2> factory;
ComPtr<IDXGIAdapter> adapter;
result = DYNAMIC_CALL(CreateDXGIFactory1, __uuidof(IDXGIFactory2), reinterpret_cast<void**>(factory.GetAddressOf())); // m_create_factory_fn();
result = OSD_DYNAMIC_CALL(CreateDXGIFactory1, __uuidof(IDXGIFactory2), reinterpret_cast<void**>(factory.GetAddressOf()));
if (result != ERROR_SUCCESS)
{
osd_printf_error("CreateDXGIFactory1 failed with error 0x%x\n", static_cast<unsigned int>(result));

10
src/osd/modules/sound/xaudio2_sound.cpp
View File

@ -203,8 +203,8 @@ private:
uint32_t m_underflows;
BOOL m_in_underflow;
BOOL m_initialized;
DYNAMIC_API(xaudio2, "dwrite.dll");
DYNAMIC_API_FN(xaudio2, HRESULT, WINAPI, XAudio2Create, IXAudio2 **, uint32_t, XAUDIO2_PROCESSOR);
OSD_DYNAMIC_API(xaudio2, "dwrite.dll");
OSD_DYNAMIC_API_FN(xaudio2, HRESULT, WINAPI, XAudio2Create, IXAudio2 **, uint32_t, XAUDIO2_PROCESSOR);
public:
sound_xaudio2() :
@ -264,7 +264,7 @@ private:
bool sound_xaudio2::probe()
{
return DYNAMIC_API_TEST(XAudio2Create);
return OSD_DYNAMIC_API_TEST(XAudio2Create);
}
//============================================================
@ -281,14 +281,14 @@ int sound_xaudio2::init(osd_options const &options)
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
// Make sure our XAudio2Create entrypoint is bound
if (!DYNAMIC_API_TEST(XAudio2Create))
if (!OSD_DYNAMIC_API_TEST(XAudio2Create))
{
osd_printf_error("Could not find XAudio2. Please try to reinstall DirectX runtime package.\n");
return 1;
}
// Create the IXAudio2 object
HR_GOERR(DYNAMIC_CALL(XAudio2Create, m_xAudio2.GetAddressOf(), 0, XAUDIO2_DEFAULT_PROCESSOR));
HR_GOERR(OSD_DYNAMIC_CALL(XAudio2Create, m_xAudio2.GetAddressOf(), 0, XAUDIO2_DEFAULT_PROCESSOR));
// make a format description for what we want
format.wBitsPerSample = 16;