[PATCH 0/1] MR1480: dinput/tests: Put the calling convention inside the function pointer parentheses.

[Alex Henrie (＠alexhenrie)]

I forgot that MSVC requires this, sorry.

[PATCH 1/1] dinput/tests: Put the calling convention inside the function pointer parentheses.

[Alex Henrie]

From: Alex Henrie

---
 dlls/dinput/tests/force_feedback.c | 10 +++++-----
 dlls/dinput/tests/hotplug.c        |  8 ++++----
 dlls/dinput/tests/joystick8.c      | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index ba37320e9f0..a2ccdb08350 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -48,11 +48,11 @@
 #include "windows.gaming.input.forcefeedback.h"
 #undef Size

-static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
-static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
-static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
-static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
-static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* );
+static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** );
+static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE );
+static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
+static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str );
+static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* );

static BOOL load_combase_functions(void)
 {
diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c
index e915d04745a..78e38b1e285 100644
--- a/dlls/dinput/tests/hotplug.c
+++ b/dlls/dinput/tests/hotplug.c
@@ -50,10 +50,10 @@
 #include "windows.gaming.input.custom.h"
 #undef Size

-static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
-static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
-static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
-static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
+static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** );
+static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE );
+static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
+static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str );

static BOOL load_combase_functions(void)
 {
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index f568c9298c6..49f7c1a201e 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -47,11 +47,11 @@
 #include "windows.gaming.input.h"
 #undef Size

-static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
-static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
-static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
-static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
-static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* );
+static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** );
+static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE );
+static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
+static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str );
+static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* );

static BOOL load_combase_functions(void)
 {

[PATCH 0/1] MR1480: dinput/tests: Put the calling convention inside the function pointer parentheses. - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.