minor clean-up for win32 directx-using sources.

Author: sezero

engine/h2shared/in_win.c

@@ -22,9 +22,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef __cplusplus
+#define CINTERFACE 1 /* for dinput.h */
+#endif
+
+#ifdef __cplusplus
+#define GUID_REF(X)  (X)
+#else
+#define GUID_REF(X) &(X)
+#endif
+
 #include "quakedef.h"
 #include "winquake.h"
 #include <mmsystem.h>
+
+#define DIRECTINPUT_VERSION 0x0300
 #include <dinput.h>
 
 // mouse variables
@@ -99,9 +111,9 @@ static HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE, DWORD, LPDIRECTINPUT*, LP
 
 #else	/* ! DX_DLSYM : linked to dinput */
 
-#define diformat           c_dfDIMouse
-#define pDirectInputCreate DirectInputCreateA
-#define Q_GUID_SysMouse    GUID_SysMouse
+#define diformat            c_dfDIMouse
+#define pDirectInputCreate  DirectInputCreateA
+#define Q_GUID_SysMouse     GUID_SysMouse
 
 #endif	/* DX_DLSYM */
 
@@ -394,7 +406,7 @@ static qboolean IN_InitDInput (void)
 	}
 
 // obtain an interface to the system mouse device.
-	hr = IDirectInput_CreateDevice(g_pdi, D3D_GUID(Q_GUID_SysMouse), &g_pMouse, NULL);
+	hr = IDirectInput_CreateDevice(g_pdi, GUID_REF(Q_GUID_SysMouse), &g_pMouse, NULL);
 	if (FAILED(hr))
 	{
 		Con_SafePrintf ("Couldn't open DI mouse device\n");

engine/h2shared/snd_dsound.c

@@ -17,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define CINTERFACE 1 /* for dsound.h */
+
 #include "quakedef.h"
 #include "snd_sys.h"
 
@@ -25,6 +27,7 @@
 #include "winquake.h"
 #include "snd_dsound.h"
 #include <mmsystem.h>
+#define DIRECTSOUND_VERSION 0x0300
 #include <dsound.h>
 
 static char s_ds_driver[] = "DirectSound";

engine/h2shared/winquake.h

@@ -24,21 +24,6 @@
 /* include windows.h here, because we need the data types */
 #include <windows.h>
 
-/* required compatibility versions for directx components */
-#define	DIRECTDRAW_VERSION	0x0300
-#define	DIRECTSOUND_VERSION	0x0300
-#define	DIRECTINPUT_VERSION	0x0300
-
-#if !defined(__cplusplus) && !defined(CINTERFACE)
-#define	CINTERFACE	/* for directx macros. */
-#endif
-
-#if defined(__cplusplus)	/* for REFGUID */
-#define D3D_GUID(X)		 (X)
-#else
-#define D3D_GUID(X)		&(X)
-#endif
-
 extern	HINSTANCE	global_hInstance;
 extern	int		global_nCmdShow;