From 5101895cc9b0c49e067b53c8658432d55178f2ae Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 9 Aug 2017 16:53:06 +0200
Subject: [PATCH] (dinput) Buildfix

---
 input/drivers/dinput.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index c28ca3babb..4314ce04f5 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -107,14 +107,17 @@ bool dinput_init_context(void)
    CoInitialize(NULL);
 
    /* Who said we shouldn't have same call signature in a COM API? <_< */
-   if (!(SUCCEEDED(DirectInput8Create(
-               GetModuleHandle(NULL), DIRECTINPUT_VERSION,
 #ifdef __cplusplus
-               IID_IDirectInput8,
+   if (!(SUCCEEDED(DirectInput8Create(
+                  GetModuleHandle(NULL), DIRECTINPUT_VERSION,
+                  IID_IDirectInput8,
+                  (void**)&g_dinput_ctx, NULL))))
 #else
-               &IID_IDirectInput8,
+      if (!(SUCCEEDED(DirectInput8Create(
+                     GetModuleHandle(NULL), DIRECTINPUT_VERSION,
+                     &IID_IDirectInput8,
+                     (void**)&g_dinput_ctx, NULL))))
 #endif
-               (void**)&g_dinput_ctx, NULL))))
       goto error;
 
    return true;
@@ -143,25 +146,29 @@ static void *dinput_init(const char *joypad_driver)
    if (!string_is_empty(joypad_driver))
       di->joypad_driver_name = strdup(joypad_driver);
 
-   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
 #ifdef __cplusplus
+   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
                GUID_SysKeyboard,
-#else
-               &GUID_SysKeyboard,
-#endif
                &di->keyboard, NULL)))
+#else
+   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
+               &GUID_SysKeyboard,
+               &di->keyboard, NULL)))
+#endif
    {
       RARCH_ERR("[DINPUT]: Failed to create keyboard device.\n");
       di->keyboard = NULL;
    }
 
-   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
 #ifdef __cplusplus
+   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
                GUID_SysMouse,
-#else
-               &GUID_SysMouse,
-#endif
                &di->mouse, NULL)))
+#else
+   if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx,
+               &GUID_SysMouse,
+               &di->mouse, NULL)))
+#endif
    {
       RARCH_ERR("[DINPUT]: Failed to create mouse device.\n");
       di->mouse = NULL;