From 9f214108eb78991227595a5b3e9080b90a16ac09 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Wed, 15 Jun 2016 16:25:43 -0400
Subject: [PATCH] Add WINAPI to other needed functions for stdcall calling
 convention on 32-bit

---
 src/osd/modules/font/font_dwrite.cpp    | 2 +-
 src/osd/modules/input/input_xinput.h    | 4 ++--
 src/osd/modules/render/d3d/d3dhlsl.h    | 2 +-
 src/osd/modules/render/drawd3d.cpp      | 2 +-
 src/osd/modules/sound/xaudio2_sound.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp
index 9c0bee36220..599a562de2b 100644
--- a/src/osd/modules/font/font_dwrite.cpp
+++ b/src/osd/modules/font/font_dwrite.cpp
@@ -80,7 +80,7 @@ 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 (*dwrite_create_factory_fn)(DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
+typedef HRESULT (WINAPI *dwrite_create_factory_fn)(DWRITE_FACTORY_TYPE, REFIID, IUnknown **);
 
 // Debugging functions
 #ifdef DWRITE_DEBUGGING
diff --git a/src/osd/modules/input/input_xinput.h b/src/osd/modules/input/input_xinput.h
index 575f6d3fe34..0c0a4de897e 100644
--- a/src/osd/modules/input/input_xinput.h
+++ b/src/osd/modules/input/input_xinput.h
@@ -91,8 +91,8 @@ struct xinput_api_state
 };
 
 // Typedefs for dynamically loaded functions
-typedef DWORD (*xinput_get_state_fn)(DWORD, XINPUT_STATE *);
-typedef DWORD (*xinput_get_caps_fn)(DWORD, DWORD, XINPUT_CAPABILITIES *);
+typedef DWORD (WINAPI *xinput_get_state_fn)(DWORD, XINPUT_STATE *);
+typedef DWORD (WINAPI *xinput_get_caps_fn)(DWORD, DWORD, XINPUT_CAPABILITIES *);
 
 class xinput_api_helper : public std::enable_shared_from_this<xinput_api_helper>
 {
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 858e486e3d3..3c9daa3c6ad 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -20,7 +20,7 @@
 //============================================================
 
 // Typedefs for dynamically loaded functions
-typedef HRESULT (*d3dx_create_effect_from_file_fn)(LPDIRECT3DDEVICE9, LPCTSTR, const D3DXMACRO *, LPD3DXINCLUDE, DWORD, LPD3DXEFFECTPOOL, LPD3DXEFFECT *, LPD3DXBUFFER *);
+typedef HRESULT (WINAPI *d3dx_create_effect_from_file_fn)(LPDIRECT3DDEVICE9, LPCTSTR, const D3DXMACRO *, LPD3DXINCLUDE, DWORD, LPD3DXEFFECTPOOL, LPD3DXEFFECT *, LPD3DXBUFFER *);
 
 class effect;
 class shaders;
diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp
index 0a6f4e50f1b..4fb1696a1eb 100644
--- a/src/osd/modules/render/drawd3d.cpp
+++ b/src/osd/modules/render/drawd3d.cpp
@@ -25,7 +25,7 @@
 //  TYPE DEFINITIONS
 //============================================================
 
-typedef IDirect3D9* (*d3d9_create_fn)(UINT);
+typedef IDirect3D9* (WINAPI *d3d9_create_fn)(UINT);
 
 
 //============================================================
diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp
index 66fdb1ba009..7ff1443b7c0 100755
--- a/src/osd/modules/sound/xaudio2_sound.cpp
+++ b/src/osd/modules/sound/xaudio2_sound.cpp
@@ -120,7 +120,7 @@ typedef std::unique_ptr<IXAudio2MasteringVoice, xaudio2_custom_deleter> masterin
 typedef std::unique_ptr<IXAudio2SourceVoice, xaudio2_custom_deleter> src_voice_ptr;
 
 // Typedef for pointer to XAudio2Create
-typedef HRESULT (*xaudio2_create_ptr)(IXAudio2 **, UINT32, XAUDIO2_PROCESSOR);
+typedef HRESULT (WINAPI *xaudio2_create_ptr)(IXAudio2 **, UINT32, XAUDIO2_PROCESSOR);
 
 //============================================================
 //  Helper classes