diff --git a/Makefile b/Makefile
index c2486650..6cedad36 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ EXT_DIR := $(TOP_DIR)/ext
# See doc/gmsl.html for further information
include $(EXT_DIR)/gmsl
-MXE_TRIPLETS := i686-pc-mingw32 x86_64-w64-mingw32 i686-w64-mingw32
+MXE_TRIPLETS := i686-w64-mingw32 x86_64-w64-mingw32
MXE_LIB_TYPES := static shared
MXE_TARGET_LIST := $(foreach TRIPLET,$(MXE_TRIPLETS),\
$(addprefix $(TRIPLET).,$(MXE_LIB_TYPES)))
diff --git a/index.html b/index.html
index 8e3e0184..2b20a41b 100644
--- a/index.html
+++ b/index.html
@@ -107,25 +107,18 @@
| Shared* |
- | MinGW 3.x |
- i686-pc-mingw32 |
- 90% (306/341) |
- 50% (169/341) |
-
-
- | MinGW-w64 |
i686-w64-mingw32 |
- 98% (334/341) |
- 58% (198/341) |
+ 99% (338/340) |
+ 62% (211/340) |
| x86_64-w64-mingw32 |
- 90% (306/341) |
- 59% (200/341) |
+ 91% (311/340) |
+ 61% (209/340) |
- These numbers were last updated on October 2, 2014. You can see the
+ These numbers were last updated on October 13, 2014. You can see the
current status by executing make build-matrix.html in the
MXE directory.
@@ -252,7 +245,7 @@ exit
make gtk lua libidn
Targets can also be specified on the command line.
- By default, only i686-pc-mingw32.static is built, but you can
+ By default, only i686-w64-mingw32.static is built, but you can
build your toolchain(s) of choice with:
make MXE_TARGETS='x86_64-w64-mingw32.static i686-w64-mingw32.static'
@@ -294,9 +287,9 @@ exit
you can add separate entries for cross builds:
export PKG_CONFIG_PATH="entries for native builds"
- export PKG_CONFIG_PATH_i686_pc_mingw32_static="entries for MXE builds"
+ export PKG_CONFIG_PATH_i686_w64_mingw32_static="entries for MXE builds"
- Remember to use i686-pc-mingw32.static-pkg-config
+ Remember to use i686-w64-mingw32.static-pkg-config
instead of pkg-config for cross builds.
The Autotools do that automatically for you.
@@ -328,13 +321,13 @@ exit
Autotools,
all you have to do is:
- ./configure --host=i686-pc-mingw32.static
+ ./configure --host=i686-w64-mingw32.static
make
If you build a library, you might also want to enforce a static build:
- ./configure --host=i686-pc-mingw32.static --enable-static --disable-shared
+ ./configure --host=i686-w64-mingw32.static --enable-static --disable-shared
make
@@ -353,7 +346,7 @@ If a cross compiler is detected then cross compile mode will be used.
CMake project,
you can use the provided toolchain file:
- cmake ... -DCMAKE_TOOLCHAIN_FILE=/where MXE is installed/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake
+ cmake ... -DCMAKE_TOOLCHAIN_FILE=/where MXE is installed/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
Step 5c: Cross compile your Project (Qt)
@@ -362,7 +355,7 @@ If a cross compiler is detected then cross compile mode will be used.
Qt application,
all you have to do is:
- /where MXE is installed/usr/i686-pc-mingw32.static/qt/bin/qmake
+ /where MXE is installed/usr/i686-w64-mingw32.static/qt/bin/qmake
make
Note that Qt 4 is in the "qt" subdirectory. Qt 5 is in the "qt5" subdirectory
@@ -397,7 +390,7 @@ PKG_CONFIG=$(CROSS)pkg-config
Then, all you have to do is:
- make CROSS=i686-pc-mingw32.static-
+ make CROSS=i686-w64-mingw32.static-
That's it!
@@ -420,12 +413,12 @@ USE_OSGPLUGIN(<plugin2>)
OpenSceneGraph source distribution for an example. This example can be
compiled with the following command:
- i686-pc-mingw32.static-g++ \
+ i686-w64-mingw32.static-g++ \
-o osgstaticviewer.exe examples/osgstaticviewer/osgstaticviewer.cpp \
- `i686-pc-mingw32.static-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \
- `i686-pc-mingw32.static-pkg-config --libs openscenegraph-osgViewer openscenegraph-osgPlugins`
+ `i686-w64-mingw32.static-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \
+ `i686-w64-mingw32.static-pkg-config --libs openscenegraph-osgViewer openscenegraph-osgPlugins`
- The i686-pc-mingw32.static-pkg-config command from MXE will
+ The i686-w64-mingw32.static-pkg-config command from MXE will
automatically add -DOSG_LIBRARY_STATIC to your compiler flags.
@@ -1883,18 +1876,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)
mdbtools |
mdbtools |
-
- | mingw-utils |
- MinGW Utilities |
-
| mingw-w64 |
MinGW-w64 Runtime |
-
- | mingwrt |
- MinGW Runtime |
-
| mpc |
GNU MPC |
@@ -2139,10 +2124,6 @@ local-pkg-list: $(LOCAL_PKG_LIST)
pthreads |
POSIX Threads |
-
- | pthreads-w32 |
- Pthreads-w32 |
-
| qdbm |
QDBM |
@@ -2447,10 +2428,6 @@ local-pkg-list: $(LOCAL_PKG_LIST)
vtk6 |
VTK6 |
-
- | w32api |
- MinGW Windows API |
-
| wavpack |
WavPack |
diff --git a/src/gcc.mk b/src/gcc.mk
index e5371213..6e8b5a5a 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -9,11 +9,7 @@ $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION)
$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS := binutils gcc-cloog gcc-gmp gcc-isl gcc-mpc gcc-mpfr
-
-$(PKG)_DEPS_i686-pc-mingw32 := $($(PKG)_DEPS) mingwrt w32api
-$(PKG)_DEPS_i686-w64-mingw32 := $($(PKG)_DEPS) mingw-w64
-$(PKG)_DEPS_x86_64-w64-mingw32 := $($(PKG)_DEPS) mingw-w64
+$(PKG)_DEPS := binutils gcc-cloog gcc-gmp gcc-isl gcc-mpc gcc-mpfr mingw-w64
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
@@ -62,16 +58,6 @@ define $(PKG)_POST_BUILD
-cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/'
endef
-define $(PKG)_BUILD_i686-pc-mingw32
- # build full cross gcc
- $($(PKG)_CONFIGURE) \
- --disable-sjlj-exceptions
- $(MAKE) -C '$(1).build' -j '$(JOBS)'
- $(MAKE) -C '$(1).build' -j 1 install
-
- $($(PKG)_POST_BUILD)
-endef
-
define $(PKG)_BUILD_mingw-w64
# build standalone gcc
$($(PKG)_CONFIGURE)
diff --git a/src/mingw-utils-1-portability-fix.patch b/src/mingw-utils-1-portability-fix.patch
deleted file mode 100644
index 42237cb9..00000000
--- a/src/mingw-utils-1-portability-fix.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://sourceforge.net/tracker/?func=detail&aid=3119898&group_id=2435&atid=102435
-
-diff -r 62cf992c82c9 reimp/reimp.c
---- a/reimp/reimp.c Fri Nov 26 19:02:28 2010 +0100
-+++ b/reimp/reimp.c Fri Nov 26 19:14:59 2010 +0100
-@@ -80,20 +80,20 @@
- return 1;
- }
-
--static int do_import (char *, uint32, FILE *);
-+static int do_import (char *, uint32_t, FILE *);
-
- /* read second linker member and process all archive members */
- static int
- read_link_member (struct ar_hdr *hdr, FILE *f)
- {
-- uint32 n_memb;
-- uint32 n_syms;
-- uint32 *ofs;
-- uint16 *idx;
-+ uint32_t n_memb;
-+ uint32_t n_syms;
-+ uint32_t *ofs;
-+ uint16_t *idx;
- char *buf;
- char *sym;
-- uint32 n;
-- uint16 i;
-+ uint32_t n;
-+ uint16_t i;
-
- /* FIXME: are offsets and sizes in host endianness? Currently we
- assume so. */
-@@ -305,7 +305,7 @@
- }
-
- void
--extract_member (char *name, uint32 size, FILE *f)
-+extract_member (char *name, uint32_t size, FILE *f)
- {
- static int non_imports = 0;
- char buf[2048];
-@@ -379,7 +379,7 @@
-
- /* process an import */
- static int
--do_import (char *name, uint32 offset, FILE *f)
-+do_import (char *name, uint32_t offset, FILE *f)
- {
- struct ar_hdr ar_hdr;
- struct imp_hdr imp_hdr;
-@@ -410,7 +410,7 @@
- extract_member (get_ar_name (&ar_hdr),
- strtol (ar_hdr.ar_size, NULL, 10), f);
- }
-- return;
-+ return 0;
- }
-
- sym = buf = xmalloc (imp_hdr.size);
-diff -r 62cf992c82c9 reimp/reimp.h
---- a/reimp/reimp.h Fri Nov 26 19:02:28 2010 +0100
-+++ b/reimp/reimp.h Fri Nov 26 19:14:59 2010 +0100
-@@ -1,14 +1,6 @@
- #include
-+#include
- #include
--
--/* we need integers of specific sizes */
--#ifndef uint32
--#define uint32 unsigned long
--#endif
--
--#ifndef uint16
--#define uint16 unsigned short
--#endif
-
- /* defines for archive */
- #ifndef ARMAG
-@@ -41,13 +33,13 @@
-
- /* import header */
- struct imp_hdr {
-- uint16 sig1;
-- uint16 sig2;
-- uint16 version;
-- uint32 time;
-- uint32 size;
-- uint16 ord_or_hint;
-- uint16 type;
-+ uint16_t sig1;
-+ uint16_t sig2;
-+ uint16_t version;
-+ uint32_t time;
-+ uint32_t size;
-+ uint16_t ord_or_hint;
-+ uint16_t type;
- };
-
- /* sig1 */
-@@ -67,7 +59,7 @@
- #define IMPORT_NAME_UNDECORATE IMPNT(3)
- #define TEST_IMPNT(t,v) (((t) & IMPNT(7)) == (v))
-
--uint32 swap_endian (uint32);
-+uint32_t swap_endian (uint32_t);
-
- #ifdef BIG_ENDIAN
- #define btonat(u) u
-@@ -87,7 +79,7 @@
-
- #if !defined(_WIN32) && !defined(__MSDOS__)
- #define spawnvp do_spawn
--int spawnvp (int, char *, char **);
-+int spawnvp (int, char *, const char * const *);
- #define P_WAIT 0
- #define P_NOWAIT 1
- #endif
-diff -r 62cf992c82c9 reimp/util.c
---- a/reimp/util.c Fri Nov 26 19:02:28 2010 +0100
-+++ b/reimp/util.c Fri Nov 26 19:14:59 2010 +0100
-@@ -1,6 +1,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-@@ -9,14 +10,14 @@
- #define swapb(a,b) a ^= b; b ^= a; a ^= b
-
- /* swap little <=> big endian */
--uint32
--swap_endian (uint32 u)
-+uint32_t
-+swap_endian (uint32_t u)
- {
- #define swapb(a,b) a ^= b; b ^= a; a ^= b
- unsigned char *p = (unsigned char *) &u;
- swapb (p[0], p[3]);
- swapb (p[1], p[2]);
-- return *((uint32 *) p);
-+ return *((uint32_t *) p);
- }
-
-
-@@ -79,7 +80,7 @@
- #endif
-
- int
--spawnvp (int mode, char *path, char **argv)
-+spawnvp (int mode, char *path, const char * const *argv)
- {
- int pid;
- int status;
-@@ -89,7 +90,7 @@
- case -1:
- return -1;
- case 0:
-- execvp (path, argv);
-+ execvp (path, (char * const *) argv);
-
- _exit (EXIT_FAILURE);
- break;
diff --git a/src/mingw-utils.mk b/src/mingw-utils.mk
deleted file mode 100644
index 40045abb..00000000
--- a/src/mingw-utils.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG := mingw-utils
-$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.4-1
-$(PKG)_CHECKSUM := 716f51d7622b36448fc1e92d2c69d8f41b1cc2df
-$(PKG)_SUBDIR := $(PKG)-$(word 1,$(subst -, ,$($(PKG)_VERSION)))
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-src.tar.lzma
-$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Extension/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS :=
-
-$(PKG)_DEPS_i686-pc-mingw32 := gcc
-
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Extension/mingw-utils/' | \
- $(SED) -n 's,.*mingw-utils-\([0-9][^"]*\)/".*,\1,p' | \
- head -1
-endef
-
-define $(PKG)_BUILD_i686-pc-mingw32
- # native build
- cp -Rp '$(1)' '$(1).native'
- cd '$(1).native' && ./configure \
- --disable-shared \
- --prefix='$(PREFIX)' \
- CFLAGS='-Wno-error=return-type'
- $(MAKE) -C '$(1).native/reimp' -j '$(JOBS)'
- $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(PREFIX)/bin/$(TARGET)-reimp'
-
- # cross build
- cd '$(1)' && ./configure \
- --host='$(TARGET)' \
- --disable-shared \
- --prefix='$(PREFIX)/$(TARGET)'
- $(MAKE) -C '$(1)' -j '$(JOBS)'
- $(MAKE) -C '$(1)' -j 1 install
-endef
-
-$(PKG)_BUILD_SHARED =
diff --git a/src/mingwrt.mk b/src/mingwrt.mk
deleted file mode 100644
index f85d9065..00000000
--- a/src/mingwrt.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG := mingwrt
-$(PKG)_IGNORE := 4%
-$(PKG)_VERSION := 3.20-2
-$(PKG)_CHECKSUM := cc6c1f841ab255e52e60f9c967cea6acf29354db
-$(PKG)_SUBDIR := .
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.lzma
-$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/$($(PKG)_FILE)
-$(PKG)_DEPS :=
-
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/' | \
- $(SED) -n 's,.*mingwrt-\([0-9][^"]*\)/".*,\1,p' | \
- head -1
-endef
-
-define $(PKG)_BUILD_i686-pc-mingw32
- $(INSTALL) -d '$(PREFIX)/$(TARGET)'
- cd '$(1)' && \
- cp -rpv include lib '$(PREFIX)/$(TARGET)'
-endef
diff --git a/src/pthreads-w32.mk b/src/pthreads-w32.mk
deleted file mode 100644
index f31ceec5..00000000
--- a/src/pthreads-w32.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG := pthreads-w32
-$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2-9-1
-$(PKG)_CHECKSUM := 24d40e89c2e66a765733e8c98d6f94500343da86
-$(PKG)_SUBDIR := pthreads-w32-$($(PKG)_VERSION)-release
-$(PKG)_FILE := pthreads-w32-$($(PKG)_VERSION)-release.tar.gz
-$(PKG)_URL := http://download.videolan.org/contrib/$($(PKG)_FILE)
-$(PKG)_URL_2 := ftp://sourceware.org/pub/pthreads-win32/$($(PKG)_FILE)
-$(PKG)_DEPS :=
-
-$(PKG)_DEPS_i686-pc-mingw32 := gcc
-
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'ftp://sourceware.org/pub/pthreads-win32/dll-latest/include/pthread.h' | \
- $(SED) -n 's/^#define PTW32_VERSION \([^,]*\),\([^,]*\),\([^,]*\),.*/\1-\2-\3/p;'
-endef
-
-define $(PKG)_BUILD_i686-pc-mingw32
- $(MAKE) -C '$(1)' -j 1 \
- $(if $(BUILD_STATIC),GC-static,GC-inlined) \
- CROSS='$(TARGET)-'
- $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
- # This is the DLL include lib on a shared build
- $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a'
- $(if $(BUILD_STATIC), \
- $(SED) -i 's/defined(PTW32_STATIC_LIB)/1/' '$(1)/pthread.h' '$(1)/sched.h' '$(1)/semaphore.h',
- $(INSTALL) -m644 '$(1)/pthreadGC2.dll' '$(PREFIX)/$(TARGET)/bin/pthread.dll')
- $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
- $(INSTALL) -m644 '$(1)/pthread.h' '$(PREFIX)/$(TARGET)/include/'
- $(INSTALL) -m644 '$(1)/sched.h' '$(PREFIX)/$(TARGET)/include/'
- $(INSTALL) -m644 '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
-
- $(PTHREADS_TEST)
-endef
diff --git a/src/pthreads.mk b/src/pthreads.mk
index d1c27576..01067743 100644
--- a/src/pthreads.mk
+++ b/src/pthreads.mk
@@ -8,7 +8,7 @@ PKG := pthreads
$(PKG)_VERSION := POSIX 1003.1-2001
$(PKG)_CHECKSUM = $(pthreads-w32_CHECKSUM)
$(PKG)_FILE = $(pthreads-w32_FILE)
-$(PKG)_DEPS := pthreads-w32 winpthreads
+$(PKG)_DEPS := winpthreads
define $(PKG)_UPDATE
echo $(pthreads_VERSION)
diff --git a/src/w32api-1-dinput-dsound.patch b/src/w32api-1-dinput-dsound.patch
deleted file mode 100644
index be1279bc..00000000
--- a/src/w32api-1-dinput-dsound.patch
+++ /dev/null
@@ -1,6743 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch contains some DirectX additions for MinGW's w32api
-which were provided by the Allegro project. It was generated
-via the following commands:
-
-#--------------------------------------------------------------------#
-wget -c 'http://alleg.sourceforge.net/files/dx80_mgw.zip'
-mkdir -p a/include b/include
-(cd b/include; unzip -aa -j ../../dx80_mgw.zip 'include/dinput.h' 'include/dsound.h')
-diff -ruN a b > w32api-1-dinput-dsound.patch
-rm -rf a b
-rm -f dx80_mgw.zip
-#--------------------------------------------------------------------#
-
-
-diff -ruN a/include/dinput.h b/include/dinput.h
---- a/include/dinput.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/dinput.h 2003-05-20 00:09:18.000000000 +0200
-@@ -0,0 +1,4373 @@
-+/****************************************************************************
-+ *
-+ * Copyright (C) 1996-2000 Microsoft Corporation. All Rights Reserved.
-+ *
-+ * File: dinput.h
-+ * Content: DirectInput include file
-+ *
-+ ****************************************************************************/
-+
-+#ifndef __DINPUT_INCLUDED__
-+#define __DINPUT_INCLUDED__
-+
-+#ifndef DIJ_RINGZERO
-+
-+#ifdef _WIN32
-+#define COM_NO_WINDOWS_H
-+#include
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+
-+
-+
-+/*
-+ * To build applications for older versions of DirectInput
-+ *
-+ * #define DIRECTINPUT_VERSION [ 0x0300 | 0x0500 | 0x0700 ]
-+ *
-+ * before #include . By default, #include
-+ * will produce a DirectX 8-compatible header file.
-+ *
-+ */
-+
-+#define DIRECTINPUT_HEADER_VERSION 0x0800
-+#ifndef DIRECTINPUT_VERSION
-+#define DIRECTINPUT_VERSION DIRECTINPUT_HEADER_VERSION
-+#endif
-+
-+#ifndef DIJ_RINGZERO
-+
-+/****************************************************************************
-+ *
-+ * Class IDs
-+ *
-+ ****************************************************************************/
-+
-+DEFINE_GUID(CLSID_DirectInput, 0x25E609E0,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(CLSID_DirectInputDevice, 0x25E609E1,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+DEFINE_GUID(CLSID_DirectInput8, 0x25E609E4,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(CLSID_DirectInputDevice8,0x25E609E5,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+/****************************************************************************
-+ *
-+ * Interfaces
-+ *
-+ ****************************************************************************/
-+
-+DEFINE_GUID(IID_IDirectInputA, 0x89521360,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInputW, 0x89521361,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInput2A, 0x5944E662,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInput2W, 0x5944E663,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInput7A, 0x9A4CB684,0x236D,0x11D3,0x8E,0x9D,0x00,0xC0,0x4F,0x68,0x44,0xAE);
-+DEFINE_GUID(IID_IDirectInput7W, 0x9A4CB685,0x236D,0x11D3,0x8E,0x9D,0x00,0xC0,0x4F,0x68,0x44,0xAE);
-+DEFINE_GUID(IID_IDirectInput8A, 0xBF798030,0x483A,0x4DA2,0xAA,0x99,0x5D,0x64,0xED,0x36,0x97,0x00);
-+DEFINE_GUID(IID_IDirectInput8W, 0xBF798031,0x483A,0x4DA2,0xAA,0x99,0x5D,0x64,0xED,0x36,0x97,0x00);
-+DEFINE_GUID(IID_IDirectInputDeviceA, 0x5944E680,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInputDeviceW, 0x5944E681,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInputDevice2A,0x5944E682,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInputDevice2W,0x5944E683,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(IID_IDirectInputDevice7A,0x57D7C6BC,0x2356,0x11D3,0x8E,0x9D,0x00,0xC0,0x4F,0x68,0x44,0xAE);
-+DEFINE_GUID(IID_IDirectInputDevice7W,0x57D7C6BD,0x2356,0x11D3,0x8E,0x9D,0x00,0xC0,0x4F,0x68,0x44,0xAE);
-+DEFINE_GUID(IID_IDirectInputDevice8A,0x54D41080,0xDC15,0x4833,0xA4,0x1B,0x74,0x8F,0x73,0xA3,0x81,0x79);
-+DEFINE_GUID(IID_IDirectInputDevice8W,0x54D41081,0xDC15,0x4833,0xA4,0x1B,0x74,0x8F,0x73,0xA3,0x81,0x79);
-+DEFINE_GUID(IID_IDirectInputEffect, 0xE7E1F7C0,0x88D2,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+
-+/****************************************************************************
-+ *
-+ * Predefined object types
-+ *
-+ ****************************************************************************/
-+
-+DEFINE_GUID(GUID_XAxis, 0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_YAxis, 0xA36D02E1,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_ZAxis, 0xA36D02E2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_RxAxis, 0xA36D02F4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_RyAxis, 0xA36D02F5,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_RzAxis, 0xA36D02E3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_Slider, 0xA36D02E4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+DEFINE_GUID(GUID_Button, 0xA36D02F0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_Key, 0x55728220,0xD33C,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+DEFINE_GUID(GUID_POV, 0xA36D02F2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+DEFINE_GUID(GUID_Unknown, 0xA36D02F3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+/****************************************************************************
-+ *
-+ * Predefined product GUIDs
-+ *
-+ ****************************************************************************/
-+
-+DEFINE_GUID(GUID_SysMouse, 0x6F1D2B60,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_SysKeyboard,0x6F1D2B61,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_Joystick ,0x6F1D2B70,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_SysMouseEm, 0x6F1D2B80,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_SysMouseEm2,0x6F1D2B81,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_SysKeyboardEm, 0x6F1D2B82,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+DEFINE_GUID(GUID_SysKeyboardEm2,0x6F1D2B83,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-+
-+/****************************************************************************
-+ *
-+ * Predefined force feedback effects
-+ *
-+ ****************************************************************************/
-+
-+DEFINE_GUID(GUID_ConstantForce, 0x13541C20,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_RampForce, 0x13541C21,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Square, 0x13541C22,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Sine, 0x13541C23,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Triangle, 0x13541C24,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_SawtoothUp, 0x13541C25,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_SawtoothDown, 0x13541C26,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Spring, 0x13541C27,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Damper, 0x13541C28,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Inertia, 0x13541C29,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_Friction, 0x13541C2A,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+DEFINE_GUID(GUID_CustomForce, 0x13541C2B,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-+
-+#endif /* DIJ_RINGZERO */
-+
-+/****************************************************************************
-+ *
-+ * Interfaces and Structures...
-+ *
-+ ****************************************************************************/
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+
-+/****************************************************************************
-+ *
-+ * IDirectInputEffect
-+ *
-+ ****************************************************************************/
-+
-+#define DIEFT_ALL 0x00000000
-+
-+#define DIEFT_CONSTANTFORCE 0x00000001
-+#define DIEFT_RAMPFORCE 0x00000002
-+#define DIEFT_PERIODIC 0x00000003
-+#define DIEFT_CONDITION 0x00000004
-+#define DIEFT_CUSTOMFORCE 0x00000005
-+#define DIEFT_HARDWARE 0x000000FF
-+#define DIEFT_FFATTACK 0x00000200
-+#define DIEFT_FFFADE 0x00000400
-+#define DIEFT_SATURATION 0x00000800
-+#define DIEFT_POSNEGCOEFFICIENTS 0x00001000
-+#define DIEFT_POSNEGSATURATION 0x00002000
-+#define DIEFT_DEADBAND 0x00004000
-+#define DIEFT_STARTDELAY 0x00008000
-+#define DIEFT_GETTYPE(n) LOBYTE(n)
-+
-+#define DI_DEGREES 100
-+#define DI_FFNOMINALMAX 10000
-+#define DI_SECONDS 1000000
-+
-+typedef struct DICONSTANTFORCE {
-+ LONG lMagnitude;
-+} DICONSTANTFORCE, *LPDICONSTANTFORCE;
-+typedef const DICONSTANTFORCE *LPCDICONSTANTFORCE;
-+
-+typedef struct DIRAMPFORCE {
-+ LONG lStart;
-+ LONG lEnd;
-+} DIRAMPFORCE, *LPDIRAMPFORCE;
-+typedef const DIRAMPFORCE *LPCDIRAMPFORCE;
-+
-+typedef struct DIPERIODIC {
-+ DWORD dwMagnitude;
-+ LONG lOffset;
-+ DWORD dwPhase;
-+ DWORD dwPeriod;
-+} DIPERIODIC, *LPDIPERIODIC;
-+typedef const DIPERIODIC *LPCDIPERIODIC;
-+
-+typedef struct DICONDITION {
-+ LONG lOffset;
-+ LONG lPositiveCoefficient;
-+ LONG lNegativeCoefficient;
-+ DWORD dwPositiveSaturation;
-+ DWORD dwNegativeSaturation;
-+ LONG lDeadBand;
-+} DICONDITION, *LPDICONDITION;
-+typedef const DICONDITION *LPCDICONDITION;
-+
-+typedef struct DICUSTOMFORCE {
-+ DWORD cChannels;
-+ DWORD dwSamplePeriod;
-+ DWORD cSamples;
-+ LPLONG rglForceData;
-+} DICUSTOMFORCE, *LPDICUSTOMFORCE;
-+typedef const DICUSTOMFORCE *LPCDICUSTOMFORCE;
-+
-+
-+typedef struct DIENVELOPE {
-+ DWORD dwSize; /* sizeof(DIENVELOPE) */
-+ DWORD dwAttackLevel;
-+ DWORD dwAttackTime; /* Microseconds */
-+ DWORD dwFadeLevel;
-+ DWORD dwFadeTime; /* Microseconds */
-+} DIENVELOPE, *LPDIENVELOPE;
-+typedef const DIENVELOPE *LPCDIENVELOPE;
-+
-+
-+/* This structure is defined for DirectX 5.0 compatibility */
-+typedef struct DIEFFECT_DX5 {
-+ DWORD dwSize; /* sizeof(DIEFFECT_DX5) */
-+ DWORD dwFlags; /* DIEFF_* */
-+ DWORD dwDuration; /* Microseconds */
-+ DWORD dwSamplePeriod; /* Microseconds */
-+ DWORD dwGain;
-+ DWORD dwTriggerButton; /* or DIEB_NOTRIGGER */
-+ DWORD dwTriggerRepeatInterval; /* Microseconds */
-+ DWORD cAxes; /* Number of axes */
-+ LPDWORD rgdwAxes; /* Array of axes */
-+ LPLONG rglDirection; /* Array of directions */
-+ LPDIENVELOPE lpEnvelope; /* Optional */
-+ DWORD cbTypeSpecificParams; /* Size of params */
-+ LPVOID lpvTypeSpecificParams; /* Pointer to params */
-+} DIEFFECT_DX5, *LPDIEFFECT_DX5;
-+typedef const DIEFFECT_DX5 *LPCDIEFFECT_DX5;
-+
-+typedef struct DIEFFECT {
-+ DWORD dwSize; /* sizeof(DIEFFECT) */
-+ DWORD dwFlags; /* DIEFF_* */
-+ DWORD dwDuration; /* Microseconds */
-+ DWORD dwSamplePeriod; /* Microseconds */
-+ DWORD dwGain;
-+ DWORD dwTriggerButton; /* or DIEB_NOTRIGGER */
-+ DWORD dwTriggerRepeatInterval; /* Microseconds */
-+ DWORD cAxes; /* Number of axes */
-+ LPDWORD rgdwAxes; /* Array of axes */
-+ LPLONG rglDirection; /* Array of directions */
-+ LPDIENVELOPE lpEnvelope; /* Optional */
-+ DWORD cbTypeSpecificParams; /* Size of params */
-+ LPVOID lpvTypeSpecificParams; /* Pointer to params */
-+#if(DIRECTINPUT_VERSION >= 0x0600)
-+ DWORD dwStartDelay; /* Microseconds */
-+#endif /* DIRECTINPUT_VERSION >= 0x0600 */
-+} DIEFFECT, *LPDIEFFECT;
-+typedef DIEFFECT DIEFFECT_DX6;
-+typedef LPDIEFFECT LPDIEFFECT_DX6;
-+typedef const DIEFFECT *LPCDIEFFECT;
-+
-+
-+#if(DIRECTINPUT_VERSION >= 0x0700)
-+#ifndef DIJ_RINGZERO
-+typedef struct DIFILEEFFECT{
-+ DWORD dwSize;
-+ GUID GuidEffect;
-+ LPCDIEFFECT lpDiEffect;
-+ CHAR szFriendlyName[MAX_PATH];
-+}DIFILEEFFECT, *LPDIFILEEFFECT;
-+typedef const DIFILEEFFECT *LPCDIFILEEFFECT;
-+typedef BOOL (FAR PASCAL * LPDIENUMEFFECTSINFILECALLBACK)(LPCDIFILEEFFECT , LPVOID);
-+#endif /* DIJ_RINGZERO */
-+#endif /* DIRECTINPUT_VERSION >= 0x0700 */
-+
-+#define DIEFF_OBJECTIDS 0x00000001
-+#define DIEFF_OBJECTOFFSETS 0x00000002
-+#define DIEFF_CARTESIAN 0x00000010
-+#define DIEFF_POLAR 0x00000020
-+#define DIEFF_SPHERICAL 0x00000040
-+
-+#define DIEP_DURATION 0x00000001
-+#define DIEP_SAMPLEPERIOD 0x00000002
-+#define DIEP_GAIN 0x00000004
-+#define DIEP_TRIGGERBUTTON 0x00000008
-+#define DIEP_TRIGGERREPEATINTERVAL 0x00000010
-+#define DIEP_AXES 0x00000020
-+#define DIEP_DIRECTION 0x00000040
-+#define DIEP_ENVELOPE 0x00000080
-+#define DIEP_TYPESPECIFICPARAMS 0x00000100
-+#if(DIRECTINPUT_VERSION >= 0x0600)
-+#define DIEP_STARTDELAY 0x00000200
-+#define DIEP_ALLPARAMS_DX5 0x000001FF
-+#define DIEP_ALLPARAMS 0x000003FF
-+#else /* DIRECTINPUT_VERSION < 0x0600 */
-+#define DIEP_ALLPARAMS 0x000001FF
-+#endif /* DIRECTINPUT_VERSION < 0x0600 */
-+#define DIEP_START 0x20000000
-+#define DIEP_NORESTART 0x40000000
-+#define DIEP_NODOWNLOAD 0x80000000
-+#define DIEB_NOTRIGGER 0xFFFFFFFF
-+
-+#define DIES_SOLO 0x00000001
-+#define DIES_NODOWNLOAD 0x80000000
-+
-+#define DIEGES_PLAYING 0x00000001
-+#define DIEGES_EMULATED 0x00000002
-+
-+typedef struct DIEFFESCAPE {
-+ DWORD dwSize;
-+ DWORD dwCommand;
-+ LPVOID lpvInBuffer;
-+ DWORD cbInBuffer;
-+ LPVOID lpvOutBuffer;
-+ DWORD cbOutBuffer;
-+} DIEFFESCAPE, *LPDIEFFESCAPE;
-+
-+#ifndef DIJ_RINGZERO
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputEffect
-+
-+DECLARE_INTERFACE_(IDirectInputEffect, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputEffect methods ***/
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+ STDMETHOD(GetEffectGuid)(THIS_ LPGUID) PURE;
-+ STDMETHOD(GetParameters)(THIS_ LPDIEFFECT,DWORD) PURE;
-+ STDMETHOD(SetParameters)(THIS_ LPCDIEFFECT,DWORD) PURE;
-+ STDMETHOD(Start)(THIS_ DWORD,DWORD) PURE;
-+ STDMETHOD(Stop)(THIS) PURE;
-+ STDMETHOD(GetEffectStatus)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(Download)(THIS) PURE;
-+ STDMETHOD(Unload)(THIS) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+};
-+
-+typedef struct IDirectInputEffect *LPDIRECTINPUTEFFECT;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInputEffect_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInputEffect_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInputEffect_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInputEffect_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#define IDirectInputEffect_GetEffectGuid(p,a) (p)->lpVtbl->GetEffectGuid(p,a)
-+#define IDirectInputEffect_GetParameters(p,a,b) (p)->lpVtbl->GetParameters(p,a,b)
-+#define IDirectInputEffect_SetParameters(p,a,b) (p)->lpVtbl->SetParameters(p,a,b)
-+#define IDirectInputEffect_Start(p,a,b) (p)->lpVtbl->Start(p,a,b)
-+#define IDirectInputEffect_Stop(p) (p)->lpVtbl->Stop(p)
-+#define IDirectInputEffect_GetEffectStatus(p,a) (p)->lpVtbl->GetEffectStatus(p,a)
-+#define IDirectInputEffect_Download(p) (p)->lpVtbl->Download(p)
-+#define IDirectInputEffect_Unload(p) (p)->lpVtbl->Unload(p)
-+#define IDirectInputEffect_Escape(p,a) (p)->lpVtbl->Escape(p,a)
-+#else
-+#define IDirectInputEffect_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInputEffect_AddRef(p) (p)->AddRef()
-+#define IDirectInputEffect_Release(p) (p)->Release()
-+#define IDirectInputEffect_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#define IDirectInputEffect_GetEffectGuid(p,a) (p)->GetEffectGuid(a)
-+#define IDirectInputEffect_GetParameters(p,a,b) (p)->GetParameters(a,b)
-+#define IDirectInputEffect_SetParameters(p,a,b) (p)->SetParameters(a,b)
-+#define IDirectInputEffect_Start(p,a,b) (p)->Start(a,b)
-+#define IDirectInputEffect_Stop(p) (p)->Stop()
-+#define IDirectInputEffect_GetEffectStatus(p,a) (p)->GetEffectStatus(a)
-+#define IDirectInputEffect_Download(p) (p)->Download()
-+#define IDirectInputEffect_Unload(p) (p)->Unload()
-+#define IDirectInputEffect_Escape(p,a) (p)->Escape(a)
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+/****************************************************************************
-+ *
-+ * IDirectInputDevice
-+ *
-+ ****************************************************************************/
-+
-+#if DIRECTINPUT_VERSION <= 0x700
-+#define DIDEVTYPE_DEVICE 1
-+#define DIDEVTYPE_MOUSE 2
-+#define DIDEVTYPE_KEYBOARD 3
-+#define DIDEVTYPE_JOYSTICK 4
-+
-+#else
-+#define DI8DEVCLASS_ALL 0
-+#define DI8DEVCLASS_DEVICE 1
-+#define DI8DEVCLASS_POINTER 2
-+#define DI8DEVCLASS_KEYBOARD 3
-+#define DI8DEVCLASS_GAMECTRL 4
-+
-+#define DI8DEVTYPE_DEVICE 0x11
-+#define DI8DEVTYPE_MOUSE 0x12
-+#define DI8DEVTYPE_KEYBOARD 0x13
-+#define DI8DEVTYPE_JOYSTICK 0x14
-+#define DI8DEVTYPE_GAMEPAD 0x15
-+#define DI8DEVTYPE_DRIVING 0x16
-+#define DI8DEVTYPE_FLIGHT 0x17
-+#define DI8DEVTYPE_1STPERSON 0x18
-+#define DI8DEVTYPE_DEVICECTRL 0x19
-+#define DI8DEVTYPE_SCREENPOINTER 0x1A
-+#define DI8DEVTYPE_REMOTE 0x1B
-+#define DI8DEVTYPE_SUPPLEMENTAL 0x1C
-+#endif /* DIRECTINPUT_VERSION <= 0x700 */
-+
-+#define DIDEVTYPE_HID 0x00010000
-+
-+#if DIRECTINPUT_VERSION <= 0x700
-+#define DIDEVTYPEMOUSE_UNKNOWN 1
-+#define DIDEVTYPEMOUSE_TRADITIONAL 2
-+#define DIDEVTYPEMOUSE_FINGERSTICK 3
-+#define DIDEVTYPEMOUSE_TOUCHPAD 4
-+#define DIDEVTYPEMOUSE_TRACKBALL 5
-+
-+#define DIDEVTYPEKEYBOARD_UNKNOWN 0
-+#define DIDEVTYPEKEYBOARD_PCXT 1
-+#define DIDEVTYPEKEYBOARD_OLIVETTI 2
-+#define DIDEVTYPEKEYBOARD_PCAT 3
-+#define DIDEVTYPEKEYBOARD_PCENH 4
-+#define DIDEVTYPEKEYBOARD_NOKIA1050 5
-+#define DIDEVTYPEKEYBOARD_NOKIA9140 6
-+#define DIDEVTYPEKEYBOARD_NEC98 7
-+#define DIDEVTYPEKEYBOARD_NEC98LAPTOP 8
-+#define DIDEVTYPEKEYBOARD_NEC98106 9
-+#define DIDEVTYPEKEYBOARD_JAPAN106 10
-+#define DIDEVTYPEKEYBOARD_JAPANAX 11
-+#define DIDEVTYPEKEYBOARD_J3100 12
-+
-+#define DIDEVTYPEJOYSTICK_UNKNOWN 1
-+#define DIDEVTYPEJOYSTICK_TRADITIONAL 2
-+#define DIDEVTYPEJOYSTICK_FLIGHTSTICK 3
-+#define DIDEVTYPEJOYSTICK_GAMEPAD 4
-+#define DIDEVTYPEJOYSTICK_RUDDER 5
-+#define DIDEVTYPEJOYSTICK_WHEEL 6
-+#define DIDEVTYPEJOYSTICK_HEADTRACKER 7
-+
-+#else
-+#define DI8DEVTYPEMOUSE_UNKNOWN 1
-+#define DI8DEVTYPEMOUSE_TRADITIONAL 2
-+#define DI8DEVTYPEMOUSE_FINGERSTICK 3
-+#define DI8DEVTYPEMOUSE_TOUCHPAD 4
-+#define DI8DEVTYPEMOUSE_TRACKBALL 5
-+#define DI8DEVTYPEMOUSE_ABSOLUTE 6
-+
-+#define DI8DEVTYPEKEYBOARD_UNKNOWN 0
-+#define DI8DEVTYPEKEYBOARD_PCXT 1
-+#define DI8DEVTYPEKEYBOARD_OLIVETTI 2
-+#define DI8DEVTYPEKEYBOARD_PCAT 3
-+#define DI8DEVTYPEKEYBOARD_PCENH 4
-+#define DI8DEVTYPEKEYBOARD_NOKIA1050 5
-+#define DI8DEVTYPEKEYBOARD_NOKIA9140 6
-+#define DI8DEVTYPEKEYBOARD_NEC98 7
-+#define DI8DEVTYPEKEYBOARD_NEC98LAPTOP 8
-+#define DI8DEVTYPEKEYBOARD_NEC98106 9
-+#define DI8DEVTYPEKEYBOARD_JAPAN106 10
-+#define DI8DEVTYPEKEYBOARD_JAPANAX 11
-+#define DI8DEVTYPEKEYBOARD_J3100 12
-+
-+#define DI8DEVTYPE_LIMITEDGAMESUBTYPE 1
-+
-+#define DI8DEVTYPEJOYSTICK_LIMITED DI8DEVTYPE_LIMITEDGAMESUBTYPE
-+#define DI8DEVTYPEJOYSTICK_STANDARD 2
-+
-+#define DI8DEVTYPEGAMEPAD_LIMITED DI8DEVTYPE_LIMITEDGAMESUBTYPE
-+#define DI8DEVTYPEGAMEPAD_STANDARD 2
-+#define DI8DEVTYPEGAMEPAD_TILT 3
-+
-+#define DI8DEVTYPEDRIVING_LIMITED DI8DEVTYPE_LIMITEDGAMESUBTYPE
-+#define DI8DEVTYPEDRIVING_COMBINEDPEDALS 2
-+#define DI8DEVTYPEDRIVING_DUALPEDALS 3
-+#define DI8DEVTYPEDRIVING_THREEPEDALS 4
-+#define DI8DEVTYPEDRIVING_HANDHELD 5
-+
-+#define DI8DEVTYPEFLIGHT_LIMITED DI8DEVTYPE_LIMITEDGAMESUBTYPE
-+#define DI8DEVTYPEFLIGHT_STICK 2
-+#define DI8DEVTYPEFLIGHT_YOKE 3
-+#define DI8DEVTYPEFLIGHT_RC 4
-+
-+#define DI8DEVTYPE1STPERSON_LIMITED DI8DEVTYPE_LIMITEDGAMESUBTYPE
-+#define DI8DEVTYPE1STPERSON_UNKNOWN 2
-+#define DI8DEVTYPE1STPERSON_SIXDOF 3
-+#define DI8DEVTYPE1STPERSON_SHOOTER 4
-+
-+#define DI8DEVTYPESCREENPTR_UNKNOWN 2
-+#define DI8DEVTYPESCREENPTR_LIGHTGUN 3
-+#define DI8DEVTYPESCREENPTR_LIGHTPEN 4
-+#define DI8DEVTYPESCREENPTR_TOUCH 5
-+
-+#define DI8DEVTYPEREMOTE_UNKNOWN 2
-+
-+#define DI8DEVTYPEDEVICECTRL_UNKNOWN 2
-+#define DI8DEVTYPEDEVICECTRL_COMMSSELECTION 3
-+#define DI8DEVTYPEDEVICECTRL_COMMSSELECTION_HARDWIRED 4
-+
-+#define DI8DEVTYPESUPPLEMENTAL_UNKNOWN 2
-+#define DI8DEVTYPESUPPLEMENTAL_2NDHANDCONTROLLER 3
-+#define DI8DEVTYPESUPPLEMENTAL_HEADTRACKER 4
-+#define DI8DEVTYPESUPPLEMENTAL_HANDTRACKER 5
-+#define DI8DEVTYPESUPPLEMENTAL_SHIFTSTICKGATE 6
-+#define DI8DEVTYPESUPPLEMENTAL_SHIFTER 7
-+#define DI8DEVTYPESUPPLEMENTAL_THROTTLE 8
-+#define DI8DEVTYPESUPPLEMENTAL_SPLITTHROTTLE 9
-+#define DI8DEVTYPESUPPLEMENTAL_COMBINEDPEDALS 10
-+#define DI8DEVTYPESUPPLEMENTAL_DUALPEDALS 11
-+#define DI8DEVTYPESUPPLEMENTAL_THREEPEDALS 12
-+#define DI8DEVTYPESUPPLEMENTAL_RUDDERPEDALS 13
-+#endif /* DIRECTINPUT_VERSION <= 0x700 */
-+
-+#define GET_DIDEVICE_TYPE(dwDevType) LOBYTE(dwDevType)
-+#define GET_DIDEVICE_SUBTYPE(dwDevType) HIBYTE(dwDevType)
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+/* This structure is defined for DirectX 3.0 compatibility */
-+typedef struct DIDEVCAPS_DX3 {
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwDevType;
-+ DWORD dwAxes;
-+ DWORD dwButtons;
-+ DWORD dwPOVs;
-+} DIDEVCAPS_DX3, *LPDIDEVCAPS_DX3;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+typedef struct DIDEVCAPS {
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwDevType;
-+ DWORD dwAxes;
-+ DWORD dwButtons;
-+ DWORD dwPOVs;
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+ DWORD dwFFSamplePeriod;
-+ DWORD dwFFMinTimeResolution;
-+ DWORD dwFirmwareRevision;
-+ DWORD dwHardwareRevision;
-+ DWORD dwFFDriverVersion;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+} DIDEVCAPS, *LPDIDEVCAPS;
-+
-+#define DIDC_ATTACHED 0x00000001
-+#define DIDC_POLLEDDEVICE 0x00000002
-+#define DIDC_EMULATED 0x00000004
-+#define DIDC_POLLEDDATAFORMAT 0x00000008
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+#define DIDC_FORCEFEEDBACK 0x00000100
-+#define DIDC_FFATTACK 0x00000200
-+#define DIDC_FFFADE 0x00000400
-+#define DIDC_SATURATION 0x00000800
-+#define DIDC_POSNEGCOEFFICIENTS 0x00001000
-+#define DIDC_POSNEGSATURATION 0x00002000
-+#define DIDC_DEADBAND 0x00004000
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+#define DIDC_STARTDELAY 0x00008000
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIDC_ALIAS 0x00010000
-+#define DIDC_PHANTOM 0x00020000
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define DIDC_HIDDEN 0x00040000
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+#define DIDFT_ALL 0x00000000
-+
-+#define DIDFT_RELAXIS 0x00000001
-+#define DIDFT_ABSAXIS 0x00000002
-+#define DIDFT_AXIS 0x00000003
-+
-+#define DIDFT_PSHBUTTON 0x00000004
-+#define DIDFT_TGLBUTTON 0x00000008
-+#define DIDFT_BUTTON 0x0000000C
-+
-+#define DIDFT_POV 0x00000010
-+#define DIDFT_COLLECTION 0x00000040
-+#define DIDFT_NODATA 0x00000080
-+
-+#define DIDFT_ANYINSTANCE 0x00FFFF00
-+#define DIDFT_INSTANCEMASK DIDFT_ANYINSTANCE
-+#define DIDFT_MAKEINSTANCE(n) ((WORD)(n) << 8)
-+#define DIDFT_GETTYPE(n) LOBYTE(n)
-+#define DIDFT_GETINSTANCE(n) LOWORD((n) >> 8)
-+#define DIDFT_FFACTUATOR 0x01000000
-+#define DIDFT_FFEFFECTTRIGGER 0x02000000
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIDFT_OUTPUT 0x10000000
-+#define DIDFT_VENDORDEFINED 0x04000000
-+#define DIDFT_ALIAS 0x08000000
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+
-+#define DIDFT_ENUMCOLLECTION(n) ((WORD)(n) << 8)
-+#define DIDFT_NOCOLLECTION 0x00FFFF00
-+
-+#ifndef DIJ_RINGZERO
-+
-+typedef struct _DIOBJECTDATAFORMAT {
-+ const GUID *pguid;
-+ DWORD dwOfs;
-+ DWORD dwType;
-+ DWORD dwFlags;
-+} DIOBJECTDATAFORMAT, *LPDIOBJECTDATAFORMAT;
-+typedef const DIOBJECTDATAFORMAT *LPCDIOBJECTDATAFORMAT;
-+
-+typedef struct _DIDATAFORMAT {
-+ DWORD dwSize;
-+ DWORD dwObjSize;
-+ DWORD dwFlags;
-+ DWORD dwDataSize;
-+ DWORD dwNumObjs;
-+ LPDIOBJECTDATAFORMAT rgodf;
-+} DIDATAFORMAT, *LPDIDATAFORMAT;
-+typedef const DIDATAFORMAT *LPCDIDATAFORMAT;
-+
-+#define DIDF_ABSAXIS 0x00000001
-+#define DIDF_RELAXIS 0x00000002
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern const DIDATAFORMAT c_dfDIMouse;
-+
-+#if(DIRECTINPUT_VERSION >= 0x0700)
-+extern const DIDATAFORMAT c_dfDIMouse2;
-+#endif /* DIRECTINPUT_VERSION >= 0x0700 */
-+
-+extern const DIDATAFORMAT c_dfDIKeyboard;
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+extern const DIDATAFORMAT c_dfDIJoystick;
-+extern const DIDATAFORMAT c_dfDIJoystick2;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+
-+#if DIRECTINPUT_VERSION > 0x0700
-+
-+typedef struct _DIACTIONA {
-+ UINT_PTR uAppData;
-+ DWORD dwSemantic;
-+ OPTIONAL DWORD dwFlags;
-+ OPTIONAL union {
-+ LPCSTR lptszActionName;
-+ UINT uResIdString;
-+ };
-+ OPTIONAL GUID guidInstance;
-+ OPTIONAL DWORD dwObjID;
-+ OPTIONAL DWORD dwHow;
-+} DIACTIONA, *LPDIACTIONA ;
-+typedef struct _DIACTIONW {
-+ UINT_PTR uAppData;
-+ DWORD dwSemantic;
-+ OPTIONAL DWORD dwFlags;
-+ OPTIONAL union {
-+ LPCWSTR lptszActionName;
-+ UINT uResIdString;
-+ };
-+ OPTIONAL GUID guidInstance;
-+ OPTIONAL DWORD dwObjID;
-+ OPTIONAL DWORD dwHow;
-+} DIACTIONW, *LPDIACTIONW ;
-+#ifdef UNICODE
-+typedef DIACTIONW DIACTION;
-+typedef LPDIACTIONW LPDIACTION;
-+#else
-+typedef DIACTIONA DIACTION;
-+typedef LPDIACTIONA LPDIACTION;
-+#endif // UNICODE
-+
-+typedef const DIACTIONA *LPCDIACTIONA;
-+typedef const DIACTIONW *LPCDIACTIONW;
-+#ifdef UNICODE
-+typedef LPCDIACTIONW LPCDIACTION;
-+#else
-+typedef LPCDIACTIONA LPCDIACTION;
-+#endif // UNICODE
-+
-+
-+#define DIA_FORCEFEEDBACK 0x00000001
-+#define DIA_APPMAPPED 0x00000002
-+#define DIA_APPNOMAP 0x00000004
-+#define DIA_NORANGE 0x00000008
-+#define DIA_APPFIXED 0x00000010
-+
-+#define DIAH_UNMAPPED 0x00000000
-+#define DIAH_USERCONFIG 0x00000001
-+#define DIAH_APPREQUESTED 0x00000002
-+#define DIAH_HWAPP 0x00000004
-+#define DIAH_HWDEFAULT 0x00000008
-+#define DIAH_DEFAULT 0x00000020
-+#define DIAH_ERROR 0x80000000
-+
-+typedef struct _DIACTIONFORMATA {
-+ DWORD dwSize;
-+ DWORD dwActionSize;
-+ DWORD dwDataSize;
-+ DWORD dwNumActions;
-+ LPDIACTIONA rgoAction;
-+ GUID guidActionMap;
-+ DWORD dwGenre;
-+ DWORD dwBufferSize;
-+ OPTIONAL LONG lAxisMin;
-+ OPTIONAL LONG lAxisMax;
-+ OPTIONAL HINSTANCE hInstString;
-+ FILETIME ftTimeStamp;
-+ DWORD dwCRC;
-+ CHAR tszActionMap[MAX_PATH];
-+} DIACTIONFORMATA, *LPDIACTIONFORMATA;
-+typedef struct _DIACTIONFORMATW {
-+ DWORD dwSize;
-+ DWORD dwActionSize;
-+ DWORD dwDataSize;
-+ DWORD dwNumActions;
-+ LPDIACTIONW rgoAction;
-+ GUID guidActionMap;
-+ DWORD dwGenre;
-+ DWORD dwBufferSize;
-+ OPTIONAL LONG lAxisMin;
-+ OPTIONAL LONG lAxisMax;
-+ OPTIONAL HINSTANCE hInstString;
-+ FILETIME ftTimeStamp;
-+ DWORD dwCRC;
-+ WCHAR tszActionMap[MAX_PATH];
-+} DIACTIONFORMATW, *LPDIACTIONFORMATW;
-+#ifdef UNICODE
-+typedef DIACTIONFORMATW DIACTIONFORMAT;
-+typedef LPDIACTIONFORMATW LPDIACTIONFORMAT;
-+#else
-+typedef DIACTIONFORMATA DIACTIONFORMAT;
-+typedef LPDIACTIONFORMATA LPDIACTIONFORMAT;
-+#endif // UNICODE
-+
-+typedef const DIACTIONFORMATA *LPCDIACTIONFORMATA;
-+typedef const DIACTIONFORMATW *LPCDIACTIONFORMATW;
-+#ifdef UNICODE
-+typedef LPCDIACTIONFORMATW LPCDIACTIONFORMAT;
-+#else
-+typedef LPCDIACTIONFORMATA LPCDIACTIONFORMAT;
-+#endif // UNICODE
-+
-+#define DIAFTS_NEWDEVICELOW 0xFFFFFFFF
-+#define DIAFTS_NEWDEVICEHIGH 0xFFFFFFFF
-+#define DIAFTS_UNUSEDDEVICELOW 0x00000000
-+#define DIAFTS_UNUSEDDEVICEHIGH 0x00000000
-+
-+#define DIDBAM_DEFAULT 0x00000000
-+#define DIDBAM_PRESERVE 0x00000001
-+#define DIDBAM_INITIALIZE 0x00000002
-+#define DIDBAM_HWDEFAULTS 0x00000004
-+
-+#define DIDSAM_DEFAULT 0x00000000
-+#define DIDSAM_NOUSER 0x00000001
-+#define DIDSAM_FORCESAVE 0x00000002
-+
-+#define DICD_DEFAULT 0x00000000
-+#define DICD_EDIT 0x00000001
-+
-+/*
-+ * The following definition is normally defined in d3dtypes.h
-+ */
-+#ifndef D3DCOLOR_DEFINED
-+typedef DWORD D3DCOLOR;
-+#define D3DCOLOR_DEFINED
-+#endif
-+
-+typedef struct _DICOLORSET{
-+ DWORD dwSize;
-+ D3DCOLOR cTextFore;
-+ D3DCOLOR cTextHighlight;
-+ D3DCOLOR cCalloutLine;
-+ D3DCOLOR cCalloutHighlight;
-+ D3DCOLOR cBorder;
-+ D3DCOLOR cControlFill;
-+ D3DCOLOR cHighlightFill;
-+ D3DCOLOR cAreaFill;
-+} DICOLORSET, *LPDICOLORSET;
-+typedef const DICOLORSET *LPCDICOLORSET;
-+
-+
-+typedef struct _DICONFIGUREDEVICESPARAMSA{
-+ DWORD dwSize;
-+ DWORD dwcUsers;
-+ LPSTR lptszUserNames;
-+ DWORD dwcFormats;
-+ LPDIACTIONFORMATA lprgFormats;
-+ HWND hwnd;
-+ DICOLORSET dics;
-+ IUnknown FAR * lpUnkDDSTarget;
-+} DICONFIGUREDEVICESPARAMSA, *LPDICONFIGUREDEVICESPARAMSA;
-+typedef struct _DICONFIGUREDEVICESPARAMSW{
-+ DWORD dwSize;
-+ DWORD dwcUsers;
-+ LPWSTR lptszUserNames;
-+ DWORD dwcFormats;
-+ LPDIACTIONFORMATW lprgFormats;
-+ HWND hwnd;
-+ DICOLORSET dics;
-+ IUnknown FAR * lpUnkDDSTarget;
-+} DICONFIGUREDEVICESPARAMSW, *LPDICONFIGUREDEVICESPARAMSW;
-+#ifdef UNICODE
-+typedef DICONFIGUREDEVICESPARAMSW DICONFIGUREDEVICESPARAMS;
-+typedef LPDICONFIGUREDEVICESPARAMSW LPDICONFIGUREDEVICESPARAMS;
-+#else
-+typedef DICONFIGUREDEVICESPARAMSA DICONFIGUREDEVICESPARAMS;
-+typedef LPDICONFIGUREDEVICESPARAMSA LPDICONFIGUREDEVICESPARAMS;
-+#endif // UNICODE
-+
-+typedef const DICONFIGUREDEVICESPARAMSA *LPCDICONFIGUREDEVICESPARAMSA;
-+typedef const DICONFIGUREDEVICESPARAMSW *LPCDICONFIGUREDEVICESPARAMSW;
-+#ifdef UNICODE
-+typedef LPCDICONFIGUREDEVICESPARAMSW LPCDICONFIGUREDEVICESPARAMS;
-+#else
-+typedef LPCDICONFIGUREDEVICESPARAMSA LPCDICONFIGUREDEVICESPARAMS;
-+#endif // UNICODE
-+
-+
-+#define DIDIFT_CONFIGURATION 0x00000001
-+#define DIDIFT_OVERLAY 0x00000002
-+
-+#define DIDAL_CENTERED 0x00000000
-+#define DIDAL_LEFTALIGNED 0x00000001
-+#define DIDAL_RIGHTALIGNED 0x00000002
-+#define DIDAL_MIDDLE 0x00000000
-+#define DIDAL_TOPALIGNED 0x00000004
-+#define DIDAL_BOTTOMALIGNED 0x00000008
-+
-+typedef struct _DIDEVICEIMAGEINFOA {
-+ CHAR tszImagePath[MAX_PATH];
-+ DWORD dwFlags;
-+ // These are valid if DIDIFT_OVERLAY is present in dwFlags.
-+ DWORD dwViewID;
-+ RECT rcOverlay;
-+ DWORD dwObjID;
-+ DWORD dwcValidPts;
-+ POINT rgptCalloutLine[5];
-+ RECT rcCalloutRect;
-+ DWORD dwTextAlign;
-+} DIDEVICEIMAGEINFOA, *LPDIDEVICEIMAGEINFOA;
-+typedef struct _DIDEVICEIMAGEINFOW {
-+ WCHAR tszImagePath[MAX_PATH];
-+ DWORD dwFlags;
-+ // These are valid if DIDIFT_OVERLAY is present in dwFlags.
-+ DWORD dwViewID;
-+ RECT rcOverlay;
-+ DWORD dwObjID;
-+ DWORD dwcValidPts;
-+ POINT rgptCalloutLine[5];
-+ RECT rcCalloutRect;
-+ DWORD dwTextAlign;
-+} DIDEVICEIMAGEINFOW, *LPDIDEVICEIMAGEINFOW;
-+#ifdef UNICODE
-+typedef DIDEVICEIMAGEINFOW DIDEVICEIMAGEINFO;
-+typedef LPDIDEVICEIMAGEINFOW LPDIDEVICEIMAGEINFO;
-+#else
-+typedef DIDEVICEIMAGEINFOA DIDEVICEIMAGEINFO;
-+typedef LPDIDEVICEIMAGEINFOA LPDIDEVICEIMAGEINFO;
-+#endif // UNICODE
-+
-+typedef const DIDEVICEIMAGEINFOA *LPCDIDEVICEIMAGEINFOA;
-+typedef const DIDEVICEIMAGEINFOW *LPCDIDEVICEIMAGEINFOW;
-+#ifdef UNICODE
-+typedef LPCDIDEVICEIMAGEINFOW LPCDIDEVICEIMAGEINFO;
-+#else
-+typedef LPCDIDEVICEIMAGEINFOA LPCDIDEVICEIMAGEINFO;
-+#endif // UNICODE
-+
-+typedef struct _DIDEVICEIMAGEINFOHEADERA {
-+ DWORD dwSize;
-+ DWORD dwSizeImageInfo;
-+ DWORD dwcViews;
-+ DWORD dwcButtons;
-+ DWORD dwcAxes;
-+ DWORD dwcPOVs;
-+ DWORD dwBufferSize;
-+ DWORD dwBufferUsed;
-+ LPDIDEVICEIMAGEINFOA lprgImageInfoArray;
-+} DIDEVICEIMAGEINFOHEADERA, *LPDIDEVICEIMAGEINFOHEADERA;
-+typedef struct _DIDEVICEIMAGEINFOHEADERW {
-+ DWORD dwSize;
-+ DWORD dwSizeImageInfo;
-+ DWORD dwcViews;
-+ DWORD dwcButtons;
-+ DWORD dwcAxes;
-+ DWORD dwcPOVs;
-+ DWORD dwBufferSize;
-+ DWORD dwBufferUsed;
-+ LPDIDEVICEIMAGEINFOW lprgImageInfoArray;
-+} DIDEVICEIMAGEINFOHEADERW, *LPDIDEVICEIMAGEINFOHEADERW;
-+#ifdef UNICODE
-+typedef DIDEVICEIMAGEINFOHEADERW DIDEVICEIMAGEINFOHEADER;
-+typedef LPDIDEVICEIMAGEINFOHEADERW LPDIDEVICEIMAGEINFOHEADER;
-+#else
-+typedef DIDEVICEIMAGEINFOHEADERA DIDEVICEIMAGEINFOHEADER;
-+typedef LPDIDEVICEIMAGEINFOHEADERA LPDIDEVICEIMAGEINFOHEADER;
-+#endif // UNICODE
-+
-+typedef const DIDEVICEIMAGEINFOHEADERA *LPCDIDEVICEIMAGEINFOHEADERA;
-+typedef const DIDEVICEIMAGEINFOHEADERW *LPCDIDEVICEIMAGEINFOHEADERW;
-+#ifdef UNICODE
-+typedef LPCDIDEVICEIMAGEINFOHEADERW LPCDIDEVICEIMAGEINFOHEADER;
-+#else
-+typedef LPCDIDEVICEIMAGEINFOHEADERA LPCDIDEVICEIMAGEINFOHEADER;
-+#endif // UNICODE
-+
-+#endif /* DIRECTINPUT_VERSION > 0x0700 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+/* These structures are defined for DirectX 3.0 compatibility */
-+
-+typedef struct DIDEVICEOBJECTINSTANCE_DX3A {
-+ DWORD dwSize;
-+ GUID guidType;
-+ DWORD dwOfs;
-+ DWORD dwType;
-+ DWORD dwFlags;
-+ CHAR tszName[MAX_PATH];
-+} DIDEVICEOBJECTINSTANCE_DX3A, *LPDIDEVICEOBJECTINSTANCE_DX3A;
-+typedef struct DIDEVICEOBJECTINSTANCE_DX3W {
-+ DWORD dwSize;
-+ GUID guidType;
-+ DWORD dwOfs;
-+ DWORD dwType;
-+ DWORD dwFlags;
-+ WCHAR tszName[MAX_PATH];
-+} DIDEVICEOBJECTINSTANCE_DX3W, *LPDIDEVICEOBJECTINSTANCE_DX3W;
-+#ifdef UNICODE
-+typedef DIDEVICEOBJECTINSTANCE_DX3W DIDEVICEOBJECTINSTANCE_DX3;
-+typedef LPDIDEVICEOBJECTINSTANCE_DX3W LPDIDEVICEOBJECTINSTANCE_DX3;
-+#else
-+typedef DIDEVICEOBJECTINSTANCE_DX3A DIDEVICEOBJECTINSTANCE_DX3;
-+typedef LPDIDEVICEOBJECTINSTANCE_DX3A LPDIDEVICEOBJECTINSTANCE_DX3;
-+#endif // UNICODE
-+typedef const DIDEVICEOBJECTINSTANCE_DX3A *LPCDIDEVICEOBJECTINSTANCE_DX3A;
-+typedef const DIDEVICEOBJECTINSTANCE_DX3W *LPCDIDEVICEOBJECTINSTANCE_DX3W;
-+typedef const DIDEVICEOBJECTINSTANCE_DX3 *LPCDIDEVICEOBJECTINSTANCE_DX3;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+typedef struct DIDEVICEOBJECTINSTANCEA {
-+ DWORD dwSize;
-+ GUID guidType;
-+ DWORD dwOfs;
-+ DWORD dwType;
-+ DWORD dwFlags;
-+ CHAR tszName[MAX_PATH];
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+ DWORD dwFFMaxForce;
-+ DWORD dwFFForceResolution;
-+ WORD wCollectionNumber;
-+ WORD wDesignatorIndex;
-+ WORD wUsagePage;
-+ WORD wUsage;
-+ DWORD dwDimension;
-+ WORD wExponent;
-+ WORD wReportId;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+} DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA;
-+typedef struct DIDEVICEOBJECTINSTANCEW {
-+ DWORD dwSize;
-+ GUID guidType;
-+ DWORD dwOfs;
-+ DWORD dwType;
-+ DWORD dwFlags;
-+ WCHAR tszName[MAX_PATH];
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+ DWORD dwFFMaxForce;
-+ DWORD dwFFForceResolution;
-+ WORD wCollectionNumber;
-+ WORD wDesignatorIndex;
-+ WORD wUsagePage;
-+ WORD wUsage;
-+ DWORD dwDimension;
-+ WORD wExponent;
-+ WORD wReportId;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+} DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW;
-+#ifdef UNICODE
-+typedef DIDEVICEOBJECTINSTANCEW DIDEVICEOBJECTINSTANCE;
-+typedef LPDIDEVICEOBJECTINSTANCEW LPDIDEVICEOBJECTINSTANCE;
-+#else
-+typedef DIDEVICEOBJECTINSTANCEA DIDEVICEOBJECTINSTANCE;
-+typedef LPDIDEVICEOBJECTINSTANCEA LPDIDEVICEOBJECTINSTANCE;
-+#endif // UNICODE
-+typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA;
-+typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;
-+typedef const DIDEVICEOBJECTINSTANCE *LPCDIDEVICEOBJECTINSTANCE;
-+
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICEOBJECTSCALLBACKA)(LPCDIDEVICEOBJECTINSTANCEA, LPVOID);
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICEOBJECTSCALLBACKW)(LPCDIDEVICEOBJECTINSTANCEW, LPVOID);
-+#ifdef UNICODE
-+#define LPDIENUMDEVICEOBJECTSCALLBACK LPDIENUMDEVICEOBJECTSCALLBACKW
-+#else
-+#define LPDIENUMDEVICEOBJECTSCALLBACK LPDIENUMDEVICEOBJECTSCALLBACKA
-+#endif // !UNICODE
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+#define DIDOI_FFACTUATOR 0x00000001
-+#define DIDOI_FFEFFECTTRIGGER 0x00000002
-+#define DIDOI_POLLED 0x00008000
-+#define DIDOI_ASPECTPOSITION 0x00000100
-+#define DIDOI_ASPECTVELOCITY 0x00000200
-+#define DIDOI_ASPECTACCEL 0x00000300
-+#define DIDOI_ASPECTFORCE 0x00000400
-+#define DIDOI_ASPECTMASK 0x00000F00
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIDOI_GUIDISUSAGE 0x00010000
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+
-+typedef struct DIPROPHEADER {
-+ DWORD dwSize;
-+ DWORD dwHeaderSize;
-+ DWORD dwObj;
-+ DWORD dwHow;
-+} DIPROPHEADER, *LPDIPROPHEADER;
-+typedef const DIPROPHEADER *LPCDIPROPHEADER;
-+
-+#define DIPH_DEVICE 0
-+#define DIPH_BYOFFSET 1
-+#define DIPH_BYID 2
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIPH_BYUSAGE 3
-+
-+#define DIMAKEUSAGEDWORD(UsagePage, Usage) \
-+ (DWORD)MAKELONG(Usage, UsagePage)
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+
-+typedef struct DIPROPDWORD {
-+ DIPROPHEADER diph;
-+ DWORD dwData;
-+} DIPROPDWORD, *LPDIPROPDWORD;
-+typedef const DIPROPDWORD *LPCDIPROPDWORD;
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+typedef struct DIPROPPOINTER {
-+ DIPROPHEADER diph;
-+ UINT_PTR uData;
-+} DIPROPPOINTER, *LPDIPROPPOINTER;
-+typedef const DIPROPPOINTER *LPCDIPROPPOINTER;
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+typedef struct DIPROPRANGE {
-+ DIPROPHEADER diph;
-+ LONG lMin;
-+ LONG lMax;
-+} DIPROPRANGE, *LPDIPROPRANGE;
-+typedef const DIPROPRANGE *LPCDIPROPRANGE;
-+
-+#define DIPROPRANGE_NOMIN ((LONG)0x80000000)
-+#define DIPROPRANGE_NOMAX ((LONG)0x7FFFFFFF)
-+
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+typedef struct DIPROPCAL {
-+ DIPROPHEADER diph;
-+ LONG lMin;
-+ LONG lCenter;
-+ LONG lMax;
-+} DIPROPCAL, *LPDIPROPCAL;
-+typedef const DIPROPCAL *LPCDIPROPCAL;
-+
-+typedef struct DIPROPGUIDANDPATH {
-+ DIPROPHEADER diph;
-+ GUID guidClass;
-+ WCHAR wszPath[MAX_PATH];
-+} DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH;
-+typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH;
-+
-+typedef struct DIPROPSTRING {
-+ DIPROPHEADER diph;
-+ WCHAR wsz[MAX_PATH];
-+} DIPROPSTRING, *LPDIPROPSTRING;
-+typedef const DIPROPSTRING *LPCDIPROPSTRING;
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define MAXCPOINTSNUM 8
-+
-+typedef struct _CPOINT
-+{
-+ LONG lP; // raw value
-+ DWORD dwLog; // logical_value / max_logical_value * 10000
-+} CPOINT, *PCPOINT;
-+
-+typedef struct DIPROPCPOINTS {
-+ DIPROPHEADER diph;
-+ DWORD dwCPointsNum;
-+ CPOINT cp[MAXCPOINTSNUM];
-+} DIPROPCPOINTS, *LPDIPROPCPOINTS;
-+typedef const DIPROPCPOINTS *LPCDIPROPCPOINTS;
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+
-+#ifdef __cplusplus
-+#define MAKEDIPROP(prop) (*(const GUID *)(prop))
-+#else
-+#define MAKEDIPROP(prop) ((REFGUID)(prop))
-+#endif
-+
-+#define DIPROP_BUFFERSIZE MAKEDIPROP(1)
-+
-+#define DIPROP_AXISMODE MAKEDIPROP(2)
-+
-+#define DIPROPAXISMODE_ABS 0
-+#define DIPROPAXISMODE_REL 1
-+
-+#define DIPROP_GRANULARITY MAKEDIPROP(3)
-+
-+#define DIPROP_RANGE MAKEDIPROP(4)
-+
-+#define DIPROP_DEADZONE MAKEDIPROP(5)
-+
-+#define DIPROP_SATURATION MAKEDIPROP(6)
-+
-+#define DIPROP_FFGAIN MAKEDIPROP(7)
-+
-+#define DIPROP_FFLOAD MAKEDIPROP(8)
-+
-+#define DIPROP_AUTOCENTER MAKEDIPROP(9)
-+
-+#define DIPROPAUTOCENTER_OFF 0
-+#define DIPROPAUTOCENTER_ON 1
-+
-+#define DIPROP_CALIBRATIONMODE MAKEDIPROP(10)
-+
-+#define DIPROPCALIBRATIONMODE_COOKED 0
-+#define DIPROPCALIBRATIONMODE_RAW 1
-+
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIPROP_CALIBRATION MAKEDIPROP(11)
-+
-+#define DIPROP_GUIDANDPATH MAKEDIPROP(12)
-+
-+#define DIPROP_INSTANCENAME MAKEDIPROP(13)
-+
-+#define DIPROP_PRODUCTNAME MAKEDIPROP(14)
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+
-+#if(DIRECTINPUT_VERSION >= 0x05b2)
-+#define DIPROP_JOYSTICKID MAKEDIPROP(15)
-+
-+#define DIPROP_GETPORTDISPLAYNAME MAKEDIPROP(16)
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x05b2 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0700)
-+#define DIPROP_PHYSICALRANGE MAKEDIPROP(18)
-+
-+#define DIPROP_LOGICALRANGE MAKEDIPROP(19)
-+#endif /* DIRECTINPUT_VERSION >= 0x0700 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define DIPROP_KEYNAME MAKEDIPROP(20)
-+
-+#define DIPROP_CPOINTS MAKEDIPROP(21)
-+
-+#define DIPROP_APPDATA MAKEDIPROP(22)
-+
-+#define DIPROP_SCANCODE MAKEDIPROP(23)
-+
-+#define DIPROP_VIDPID MAKEDIPROP(24)
-+
-+#define DIPROP_USERNAME MAKEDIPROP(25)
-+
-+#define DIPROP_TYPENAME MAKEDIPROP(26)
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+
-+typedef struct DIDEVICEOBJECTDATA_DX3 {
-+ DWORD dwOfs;
-+ DWORD dwData;
-+ DWORD dwTimeStamp;
-+ DWORD dwSequence;
-+} DIDEVICEOBJECTDATA_DX3, *LPDIDEVICEOBJECTDATA_DX3;
-+typedef const DIDEVICEOBJECTDATA_DX3 *LPCDIDEVICEOBJECTDATA_DX;
-+
-+typedef struct DIDEVICEOBJECTDATA {
-+ DWORD dwOfs;
-+ DWORD dwData;
-+ DWORD dwTimeStamp;
-+ DWORD dwSequence;
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+ UINT_PTR uAppData;
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+} DIDEVICEOBJECTDATA, *LPDIDEVICEOBJECTDATA;
-+typedef const DIDEVICEOBJECTDATA *LPCDIDEVICEOBJECTDATA;
-+
-+#define DIGDD_PEEK 0x00000001
-+
-+#define DISEQUENCE_COMPARE(dwSequence1, cmp, dwSequence2) \
-+ ((int)((dwSequence1) - (dwSequence2)) cmp 0)
-+#define DISCL_EXCLUSIVE 0x00000001
-+#define DISCL_NONEXCLUSIVE 0x00000002
-+#define DISCL_FOREGROUND 0x00000004
-+#define DISCL_BACKGROUND 0x00000008
-+#define DISCL_NOWINKEY 0x00000010
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+/* These structures are defined for DirectX 3.0 compatibility */
-+
-+typedef struct DIDEVICEINSTANCE_DX3A {
-+ DWORD dwSize;
-+ GUID guidInstance;
-+ GUID guidProduct;
-+ DWORD dwDevType;
-+ CHAR tszInstanceName[MAX_PATH];
-+ CHAR tszProductName[MAX_PATH];
-+} DIDEVICEINSTANCE_DX3A, *LPDIDEVICEINSTANCE_DX3A;
-+typedef struct DIDEVICEINSTANCE_DX3W {
-+ DWORD dwSize;
-+ GUID guidInstance;
-+ GUID guidProduct;
-+ DWORD dwDevType;
-+ WCHAR tszInstanceName[MAX_PATH];
-+ WCHAR tszProductName[MAX_PATH];
-+} DIDEVICEINSTANCE_DX3W, *LPDIDEVICEINSTANCE_DX3W;
-+#ifdef UNICODE
-+typedef DIDEVICEINSTANCE_DX3W DIDEVICEINSTANCE_DX3;
-+typedef LPDIDEVICEINSTANCE_DX3W LPDIDEVICEINSTANCE_DX3;
-+#else
-+typedef DIDEVICEINSTANCE_DX3A DIDEVICEINSTANCE_DX3;
-+typedef LPDIDEVICEINSTANCE_DX3A LPDIDEVICEINSTANCE_DX3;
-+#endif // UNICODE
-+typedef const DIDEVICEINSTANCE_DX3A *LPCDIDEVICEINSTANCE_DX3A;
-+typedef const DIDEVICEINSTANCE_DX3W *LPCDIDEVICEINSTANCE_DX3W;
-+typedef const DIDEVICEINSTANCE_DX3 *LPCDIDEVICEINSTANCE_DX3;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+typedef struct DIDEVICEINSTANCEA {
-+ DWORD dwSize;
-+ GUID guidInstance;
-+ GUID guidProduct;
-+ DWORD dwDevType;
-+ CHAR tszInstanceName[MAX_PATH];
-+ CHAR tszProductName[MAX_PATH];
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+ GUID guidFFDriver;
-+ WORD wUsagePage;
-+ WORD wUsage;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+} DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA;
-+typedef struct DIDEVICEINSTANCEW {
-+ DWORD dwSize;
-+ GUID guidInstance;
-+ GUID guidProduct;
-+ DWORD dwDevType;
-+ WCHAR tszInstanceName[MAX_PATH];
-+ WCHAR tszProductName[MAX_PATH];
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+ GUID guidFFDriver;
-+ WORD wUsagePage;
-+ WORD wUsage;
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+} DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW;
-+#ifdef UNICODE
-+typedef DIDEVICEINSTANCEW DIDEVICEINSTANCE;
-+typedef LPDIDEVICEINSTANCEW LPDIDEVICEINSTANCE;
-+#else
-+typedef DIDEVICEINSTANCEA DIDEVICEINSTANCE;
-+typedef LPDIDEVICEINSTANCEA LPDIDEVICEINSTANCE;
-+#endif // UNICODE
-+
-+typedef const DIDEVICEINSTANCEA *LPCDIDEVICEINSTANCEA;
-+typedef const DIDEVICEINSTANCEW *LPCDIDEVICEINSTANCEW;
-+#ifdef UNICODE
-+typedef LPCDIDEVICEINSTANCEW LPCDIDEVICEINSTANCE;
-+#else
-+typedef LPCDIDEVICEINSTANCEA LPCDIDEVICEINSTANCE;
-+#endif // UNICODE
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDeviceW
-+
-+DECLARE_INTERFACE_(IDirectInputDeviceW, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDeviceW methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEW,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+};
-+
-+typedef struct IDirectInputDeviceW *LPDIRECTINPUTDEVICEW;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDeviceA
-+
-+DECLARE_INTERFACE_(IDirectInputDeviceA, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDeviceA methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEA,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+};
-+
-+typedef struct IDirectInputDeviceA *LPDIRECTINPUTDEVICEA;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInputDevice IID_IDirectInputDeviceW
-+#define IDirectInputDevice IDirectInputDeviceW
-+#define IDirectInputDeviceVtbl IDirectInputDeviceWVtbl
-+#else
-+#define IID_IDirectInputDevice IID_IDirectInputDeviceA
-+#define IDirectInputDevice IDirectInputDeviceA
-+#define IDirectInputDeviceVtbl IDirectInputDeviceAVtbl
-+#endif
-+typedef struct IDirectInputDevice *LPDIRECTINPUTDEVICE;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInputDevice_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInputDevice_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInputDevice_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInputDevice_GetCapabilities(p,a) (p)->lpVtbl->GetCapabilities(p,a)
-+#define IDirectInputDevice_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-+#define IDirectInputDevice_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b)
-+#define IDirectInputDevice_SetProperty(p,a,b) (p)->lpVtbl->SetProperty(p,a,b)
-+#define IDirectInputDevice_Acquire(p) (p)->lpVtbl->Acquire(p)
-+#define IDirectInputDevice_Unacquire(p) (p)->lpVtbl->Unacquire(p)
-+#define IDirectInputDevice_GetDeviceState(p,a,b) (p)->lpVtbl->GetDeviceState(p,a,b)
-+#define IDirectInputDevice_GetDeviceData(p,a,b,c,d) (p)->lpVtbl->GetDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice_SetDataFormat(p,a) (p)->lpVtbl->SetDataFormat(p,a)
-+#define IDirectInputDevice_SetEventNotification(p,a) (p)->lpVtbl->SetEventNotification(p,a)
-+#define IDirectInputDevice_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectInputDevice_GetObjectInfo(p,a,b,c) (p)->lpVtbl->GetObjectInfo(p,a,b,c)
-+#define IDirectInputDevice_GetDeviceInfo(p,a) (p)->lpVtbl->GetDeviceInfo(p,a)
-+#define IDirectInputDevice_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInputDevice_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#else
-+#define IDirectInputDevice_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInputDevice_AddRef(p) (p)->AddRef()
-+#define IDirectInputDevice_Release(p) (p)->Release()
-+#define IDirectInputDevice_GetCapabilities(p,a) (p)->GetCapabilities(a)
-+#define IDirectInputDevice_EnumObjects(p,a,b,c) (p)->EnumObjects(a,b,c)
-+#define IDirectInputDevice_GetProperty(p,a,b) (p)->GetProperty(a,b)
-+#define IDirectInputDevice_SetProperty(p,a,b) (p)->SetProperty(a,b)
-+#define IDirectInputDevice_Acquire(p) (p)->Acquire()
-+#define IDirectInputDevice_Unacquire(p) (p)->Unacquire()
-+#define IDirectInputDevice_GetDeviceState(p,a,b) (p)->GetDeviceState(a,b)
-+#define IDirectInputDevice_GetDeviceData(p,a,b,c,d) (p)->GetDeviceData(a,b,c,d)
-+#define IDirectInputDevice_SetDataFormat(p,a) (p)->SetDataFormat(a)
-+#define IDirectInputDevice_SetEventNotification(p,a) (p)->SetEventNotification(a)
-+#define IDirectInputDevice_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectInputDevice_GetObjectInfo(p,a,b,c) (p)->GetObjectInfo(a,b,c)
-+#define IDirectInputDevice_GetDeviceInfo(p,a) (p)->GetDeviceInfo(a)
-+#define IDirectInputDevice_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInputDevice_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+
-+#define DISFFC_RESET 0x00000001
-+#define DISFFC_STOPALL 0x00000002
-+#define DISFFC_PAUSE 0x00000004
-+#define DISFFC_CONTINUE 0x00000008
-+#define DISFFC_SETACTUATORSON 0x00000010
-+#define DISFFC_SETACTUATORSOFF 0x00000020
-+
-+#define DIGFFS_EMPTY 0x00000001
-+#define DIGFFS_STOPPED 0x00000002
-+#define DIGFFS_PAUSED 0x00000004
-+#define DIGFFS_ACTUATORSON 0x00000010
-+#define DIGFFS_ACTUATORSOFF 0x00000020
-+#define DIGFFS_POWERON 0x00000040
-+#define DIGFFS_POWEROFF 0x00000080
-+#define DIGFFS_SAFETYSWITCHON 0x00000100
-+#define DIGFFS_SAFETYSWITCHOFF 0x00000200
-+#define DIGFFS_USERFFSWITCHON 0x00000400
-+#define DIGFFS_USERFFSWITCHOFF 0x00000800
-+#define DIGFFS_DEVICELOST 0x80000000
-+
-+#ifndef DIJ_RINGZERO
-+
-+typedef struct DIEFFECTINFOA {
-+ DWORD dwSize;
-+ GUID guid;
-+ DWORD dwEffType;
-+ DWORD dwStaticParams;
-+ DWORD dwDynamicParams;
-+ CHAR tszName[MAX_PATH];
-+} DIEFFECTINFOA, *LPDIEFFECTINFOA;
-+typedef struct DIEFFECTINFOW {
-+ DWORD dwSize;
-+ GUID guid;
-+ DWORD dwEffType;
-+ DWORD dwStaticParams;
-+ DWORD dwDynamicParams;
-+ WCHAR tszName[MAX_PATH];
-+} DIEFFECTINFOW, *LPDIEFFECTINFOW;
-+#ifdef UNICODE
-+typedef DIEFFECTINFOW DIEFFECTINFO;
-+typedef LPDIEFFECTINFOW LPDIEFFECTINFO;
-+#else
-+typedef DIEFFECTINFOA DIEFFECTINFO;
-+typedef LPDIEFFECTINFOA LPDIEFFECTINFO;
-+#endif // UNICODE
-+typedef const DIEFFECTINFOA *LPCDIEFFECTINFOA;
-+typedef const DIEFFECTINFOW *LPCDIEFFECTINFOW;
-+typedef const DIEFFECTINFO *LPCDIEFFECTINFO;
-+
-+#define DISDD_CONTINUE 0x00000001
-+
-+typedef BOOL (FAR PASCAL * LPDIENUMEFFECTSCALLBACKA)(LPCDIEFFECTINFOA, LPVOID);
-+typedef BOOL (FAR PASCAL * LPDIENUMEFFECTSCALLBACKW)(LPCDIEFFECTINFOW, LPVOID);
-+#ifdef UNICODE
-+#define LPDIENUMEFFECTSCALLBACK LPDIENUMEFFECTSCALLBACKW
-+#else
-+#define LPDIENUMEFFECTSCALLBACK LPDIENUMEFFECTSCALLBACKA
-+#endif // !UNICODE
-+typedef BOOL (FAR PASCAL * LPDIENUMCREATEDEFFECTOBJECTSCALLBACK)(LPDIRECTINPUTEFFECT, LPVOID);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice2W
-+
-+DECLARE_INTERFACE_(IDirectInputDevice2W, IDirectInputDeviceW)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDeviceW methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEW,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+
-+ /*** IDirectInputDevice2W methods ***/
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOW,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputDevice2W *LPDIRECTINPUTDEVICE2W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice2A
-+
-+DECLARE_INTERFACE_(IDirectInputDevice2A, IDirectInputDeviceA)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDeviceA methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEA,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+
-+ /*** IDirectInputDevice2A methods ***/
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOA,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputDevice2A *LPDIRECTINPUTDEVICE2A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInputDevice2 IID_IDirectInputDevice2W
-+#define IDirectInputDevice2 IDirectInputDevice2W
-+#define IDirectInputDevice2Vtbl IDirectInputDevice2WVtbl
-+#else
-+#define IID_IDirectInputDevice2 IID_IDirectInputDevice2A
-+#define IDirectInputDevice2 IDirectInputDevice2A
-+#define IDirectInputDevice2Vtbl IDirectInputDevice2AVtbl
-+#endif
-+typedef struct IDirectInputDevice2 *LPDIRECTINPUTDEVICE2;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInputDevice2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInputDevice2_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInputDevice2_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInputDevice2_GetCapabilities(p,a) (p)->lpVtbl->GetCapabilities(p,a)
-+#define IDirectInputDevice2_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-+#define IDirectInputDevice2_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b)
-+#define IDirectInputDevice2_SetProperty(p,a,b) (p)->lpVtbl->SetProperty(p,a,b)
-+#define IDirectInputDevice2_Acquire(p) (p)->lpVtbl->Acquire(p)
-+#define IDirectInputDevice2_Unacquire(p) (p)->lpVtbl->Unacquire(p)
-+#define IDirectInputDevice2_GetDeviceState(p,a,b) (p)->lpVtbl->GetDeviceState(p,a,b)
-+#define IDirectInputDevice2_GetDeviceData(p,a,b,c,d) (p)->lpVtbl->GetDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice2_SetDataFormat(p,a) (p)->lpVtbl->SetDataFormat(p,a)
-+#define IDirectInputDevice2_SetEventNotification(p,a) (p)->lpVtbl->SetEventNotification(p,a)
-+#define IDirectInputDevice2_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectInputDevice2_GetObjectInfo(p,a,b,c) (p)->lpVtbl->GetObjectInfo(p,a,b,c)
-+#define IDirectInputDevice2_GetDeviceInfo(p,a) (p)->lpVtbl->GetDeviceInfo(p,a)
-+#define IDirectInputDevice2_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInputDevice2_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#define IDirectInputDevice2_CreateEffect(p,a,b,c,d) (p)->lpVtbl->CreateEffect(p,a,b,c,d)
-+#define IDirectInputDevice2_EnumEffects(p,a,b,c) (p)->lpVtbl->EnumEffects(p,a,b,c)
-+#define IDirectInputDevice2_GetEffectInfo(p,a,b) (p)->lpVtbl->GetEffectInfo(p,a,b)
-+#define IDirectInputDevice2_GetForceFeedbackState(p,a) (p)->lpVtbl->GetForceFeedbackState(p,a)
-+#define IDirectInputDevice2_SendForceFeedbackCommand(p,a) (p)->lpVtbl->SendForceFeedbackCommand(p,a)
-+#define IDirectInputDevice2_EnumCreatedEffectObjects(p,a,b,c) (p)->lpVtbl->EnumCreatedEffectObjects(p,a,b,c)
-+#define IDirectInputDevice2_Escape(p,a) (p)->lpVtbl->Escape(p,a)
-+#define IDirectInputDevice2_Poll(p) (p)->lpVtbl->Poll(p)
-+#define IDirectInputDevice2_SendDeviceData(p,a,b,c,d) (p)->lpVtbl->SendDeviceData(p,a,b,c,d)
-+#else
-+#define IDirectInputDevice2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInputDevice2_AddRef(p) (p)->AddRef()
-+#define IDirectInputDevice2_Release(p) (p)->Release()
-+#define IDirectInputDevice2_GetCapabilities(p,a) (p)->GetCapabilities(a)
-+#define IDirectInputDevice2_EnumObjects(p,a,b,c) (p)->EnumObjects(a,b,c)
-+#define IDirectInputDevice2_GetProperty(p,a,b) (p)->GetProperty(a,b)
-+#define IDirectInputDevice2_SetProperty(p,a,b) (p)->SetProperty(a,b)
-+#define IDirectInputDevice2_Acquire(p) (p)->Acquire()
-+#define IDirectInputDevice2_Unacquire(p) (p)->Unacquire()
-+#define IDirectInputDevice2_GetDeviceState(p,a,b) (p)->GetDeviceState(a,b)
-+#define IDirectInputDevice2_GetDeviceData(p,a,b,c,d) (p)->GetDeviceData(a,b,c,d)
-+#define IDirectInputDevice2_SetDataFormat(p,a) (p)->SetDataFormat(a)
-+#define IDirectInputDevice2_SetEventNotification(p,a) (p)->SetEventNotification(a)
-+#define IDirectInputDevice2_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectInputDevice2_GetObjectInfo(p,a,b,c) (p)->GetObjectInfo(a,b,c)
-+#define IDirectInputDevice2_GetDeviceInfo(p,a) (p)->GetDeviceInfo(a)
-+#define IDirectInputDevice2_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInputDevice2_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#define IDirectInputDevice2_CreateEffect(p,a,b,c,d) (p)->CreateEffect(a,b,c,d)
-+#define IDirectInputDevice2_EnumEffects(p,a,b,c) (p)->EnumEffects(a,b,c)
-+#define IDirectInputDevice2_GetEffectInfo(p,a,b) (p)->GetEffectInfo(a,b)
-+#define IDirectInputDevice2_GetForceFeedbackState(p,a) (p)->GetForceFeedbackState(a)
-+#define IDirectInputDevice2_SendForceFeedbackCommand(p,a) (p)->SendForceFeedbackCommand(a)
-+#define IDirectInputDevice2_EnumCreatedEffectObjects(p,a,b,c) (p)->EnumCreatedEffectObjects(a,b,c)
-+#define IDirectInputDevice2_Escape(p,a) (p)->Escape(a)
-+#define IDirectInputDevice2_Poll(p) (p)->Poll()
-+#define IDirectInputDevice2_SendDeviceData(p,a,b,c,d) (p)->SendDeviceData(a,b,c,d)
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0700)
-+#define DIFEF_DEFAULT 0x00000000
-+#define DIFEF_INCLUDENONSTANDARD 0x00000001
-+#define DIFEF_MODIFYIFNEEDED 0x00000010
-+
-+#ifndef DIJ_RINGZERO
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice7W
-+
-+DECLARE_INTERFACE_(IDirectInputDevice7W, IDirectInputDevice2W)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDevice2W methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEW,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOW,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+
-+ /*** IDirectInputDevice7W methods ***/
-+ STDMETHOD(EnumEffectsInFile)(THIS_ LPCWSTR,LPDIENUMEFFECTSINFILECALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(WriteEffectToFile)(THIS_ LPCWSTR,DWORD,LPDIFILEEFFECT,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputDevice7W *LPDIRECTINPUTDEVICE7W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice7A
-+
-+DECLARE_INTERFACE_(IDirectInputDevice7A, IDirectInputDevice2A)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDevice2A methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEA,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOA,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+
-+ /*** IDirectInputDevice7A methods ***/
-+ STDMETHOD(EnumEffectsInFile)(THIS_ LPCSTR,LPDIENUMEFFECTSINFILECALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(WriteEffectToFile)(THIS_ LPCSTR,DWORD,LPDIFILEEFFECT,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputDevice7A *LPDIRECTINPUTDEVICE7A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInputDevice7 IID_IDirectInputDevice7W
-+#define IDirectInputDevice7 IDirectInputDevice7W
-+#define IDirectInputDevice7Vtbl IDirectInputDevice7WVtbl
-+#else
-+#define IID_IDirectInputDevice7 IID_IDirectInputDevice7A
-+#define IDirectInputDevice7 IDirectInputDevice7A
-+#define IDirectInputDevice7Vtbl IDirectInputDevice7AVtbl
-+#endif
-+typedef struct IDirectInputDevice7 *LPDIRECTINPUTDEVICE7;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInputDevice7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInputDevice7_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInputDevice7_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInputDevice7_GetCapabilities(p,a) (p)->lpVtbl->GetCapabilities(p,a)
-+#define IDirectInputDevice7_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-+#define IDirectInputDevice7_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b)
-+#define IDirectInputDevice7_SetProperty(p,a,b) (p)->lpVtbl->SetProperty(p,a,b)
-+#define IDirectInputDevice7_Acquire(p) (p)->lpVtbl->Acquire(p)
-+#define IDirectInputDevice7_Unacquire(p) (p)->lpVtbl->Unacquire(p)
-+#define IDirectInputDevice7_GetDeviceState(p,a,b) (p)->lpVtbl->GetDeviceState(p,a,b)
-+#define IDirectInputDevice7_GetDeviceData(p,a,b,c,d) (p)->lpVtbl->GetDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice7_SetDataFormat(p,a) (p)->lpVtbl->SetDataFormat(p,a)
-+#define IDirectInputDevice7_SetEventNotification(p,a) (p)->lpVtbl->SetEventNotification(p,a)
-+#define IDirectInputDevice7_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectInputDevice7_GetObjectInfo(p,a,b,c) (p)->lpVtbl->GetObjectInfo(p,a,b,c)
-+#define IDirectInputDevice7_GetDeviceInfo(p,a) (p)->lpVtbl->GetDeviceInfo(p,a)
-+#define IDirectInputDevice7_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInputDevice7_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#define IDirectInputDevice7_CreateEffect(p,a,b,c,d) (p)->lpVtbl->CreateEffect(p,a,b,c,d)
-+#define IDirectInputDevice7_EnumEffects(p,a,b,c) (p)->lpVtbl->EnumEffects(p,a,b,c)
-+#define IDirectInputDevice7_GetEffectInfo(p,a,b) (p)->lpVtbl->GetEffectInfo(p,a,b)
-+#define IDirectInputDevice7_GetForceFeedbackState(p,a) (p)->lpVtbl->GetForceFeedbackState(p,a)
-+#define IDirectInputDevice7_SendForceFeedbackCommand(p,a) (p)->lpVtbl->SendForceFeedbackCommand(p,a)
-+#define IDirectInputDevice7_EnumCreatedEffectObjects(p,a,b,c) (p)->lpVtbl->EnumCreatedEffectObjects(p,a,b,c)
-+#define IDirectInputDevice7_Escape(p,a) (p)->lpVtbl->Escape(p,a)
-+#define IDirectInputDevice7_Poll(p) (p)->lpVtbl->Poll(p)
-+#define IDirectInputDevice7_SendDeviceData(p,a,b,c,d) (p)->lpVtbl->SendDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice7_EnumEffectsInFile(p,a,b,c,d) (p)->lpVtbl->EnumEffectsInFile(p,a,b,c,d)
-+#define IDirectInputDevice7_WriteEffectToFile(p,a,b,c,d) (p)->lpVtbl->WriteEffectToFile(p,a,b,c,d)
-+#else
-+#define IDirectInputDevice7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInputDevice7_AddRef(p) (p)->AddRef()
-+#define IDirectInputDevice7_Release(p) (p)->Release()
-+#define IDirectInputDevice7_GetCapabilities(p,a) (p)->GetCapabilities(a)
-+#define IDirectInputDevice7_EnumObjects(p,a,b,c) (p)->EnumObjects(a,b,c)
-+#define IDirectInputDevice7_GetProperty(p,a,b) (p)->GetProperty(a,b)
-+#define IDirectInputDevice7_SetProperty(p,a,b) (p)->SetProperty(a,b)
-+#define IDirectInputDevice7_Acquire(p) (p)->Acquire()
-+#define IDirectInputDevice7_Unacquire(p) (p)->Unacquire()
-+#define IDirectInputDevice7_GetDeviceState(p,a,b) (p)->GetDeviceState(a,b)
-+#define IDirectInputDevice7_GetDeviceData(p,a,b,c,d) (p)->GetDeviceData(a,b,c,d)
-+#define IDirectInputDevice7_SetDataFormat(p,a) (p)->SetDataFormat(a)
-+#define IDirectInputDevice7_SetEventNotification(p,a) (p)->SetEventNotification(a)
-+#define IDirectInputDevice7_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectInputDevice7_GetObjectInfo(p,a,b,c) (p)->GetObjectInfo(a,b,c)
-+#define IDirectInputDevice7_GetDeviceInfo(p,a) (p)->GetDeviceInfo(a)
-+#define IDirectInputDevice7_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInputDevice7_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#define IDirectInputDevice7_CreateEffect(p,a,b,c,d) (p)->CreateEffect(a,b,c,d)
-+#define IDirectInputDevice7_EnumEffects(p,a,b,c) (p)->EnumEffects(a,b,c)
-+#define IDirectInputDevice7_GetEffectInfo(p,a,b) (p)->GetEffectInfo(a,b)
-+#define IDirectInputDevice7_GetForceFeedbackState(p,a) (p)->GetForceFeedbackState(a)
-+#define IDirectInputDevice7_SendForceFeedbackCommand(p,a) (p)->SendForceFeedbackCommand(a)
-+#define IDirectInputDevice7_EnumCreatedEffectObjects(p,a,b,c) (p)->EnumCreatedEffectObjects(a,b,c)
-+#define IDirectInputDevice7_Escape(p,a) (p)->Escape(a)
-+#define IDirectInputDevice7_Poll(p) (p)->Poll()
-+#define IDirectInputDevice7_SendDeviceData(p,a,b,c,d) (p)->SendDeviceData(a,b,c,d)
-+#define IDirectInputDevice7_EnumEffectsInFile(p,a,b,c,d) (p)->EnumEffectsInFile(a,b,c,d)
-+#define IDirectInputDevice7_WriteEffectToFile(p,a,b,c,d) (p)->WriteEffectToFile(a,b,c,d)
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x0700 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+
-+#ifndef DIJ_RINGZERO
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice8W
-+
-+DECLARE_INTERFACE_(IDirectInputDevice8W, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDevice8W methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEW,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOW,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(EnumEffectsInFile)(THIS_ LPCWSTR,LPDIENUMEFFECTSINFILECALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(WriteEffectToFile)(THIS_ LPCWSTR,DWORD,LPDIFILEEFFECT,DWORD) PURE;
-+ STDMETHOD(BuildActionMap)(THIS_ LPDIACTIONFORMATW,LPCWSTR,DWORD) PURE;
-+ STDMETHOD(SetActionMap)(THIS_ LPDIACTIONFORMATW,LPCWSTR,DWORD) PURE;
-+ STDMETHOD(GetImageInfo)(THIS_ LPDIDEVICEIMAGEINFOHEADERW) PURE;
-+};
-+
-+typedef struct IDirectInputDevice8W *LPDIRECTINPUTDEVICE8W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputDevice8A
-+
-+DECLARE_INTERFACE_(IDirectInputDevice8A, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputDevice8A methods ***/
-+ STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-+ STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-+ STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-+ STDMETHOD(Acquire)(THIS) PURE;
-+ STDMETHOD(Unacquire)(THIS) PURE;
-+ STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-+ STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-+ STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEA,DWORD,DWORD) PURE;
-+ STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-+ STDMETHOD(CreateEffect)(THIS_ REFGUID,LPCDIEFFECT,LPDIRECTINPUTEFFECT *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumEffects)(THIS_ LPDIENUMEFFECTSCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetEffectInfo)(THIS_ LPDIEFFECTINFOA,REFGUID) PURE;
-+ STDMETHOD(GetForceFeedbackState)(THIS_ LPDWORD) PURE;
-+ STDMETHOD(SendForceFeedbackCommand)(THIS_ DWORD) PURE;
-+ STDMETHOD(EnumCreatedEffectObjects)(THIS_ LPDIENUMCREATEDEFFECTOBJECTSCALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE;
-+ STDMETHOD(Poll)(THIS) PURE;
-+ STDMETHOD(SendDeviceData)(THIS_ DWORD,LPCDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-+ STDMETHOD(EnumEffectsInFile)(THIS_ LPCSTR,LPDIENUMEFFECTSINFILECALLBACK,LPVOID,DWORD) PURE;
-+ STDMETHOD(WriteEffectToFile)(THIS_ LPCSTR,DWORD,LPDIFILEEFFECT,DWORD) PURE;
-+ STDMETHOD(BuildActionMap)(THIS_ LPDIACTIONFORMATA,LPCSTR,DWORD) PURE;
-+ STDMETHOD(SetActionMap)(THIS_ LPDIACTIONFORMATA,LPCSTR,DWORD) PURE;
-+ STDMETHOD(GetImageInfo)(THIS_ LPDIDEVICEIMAGEINFOHEADERA) PURE;
-+};
-+
-+typedef struct IDirectInputDevice8A *LPDIRECTINPUTDEVICE8A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInputDevice8 IID_IDirectInputDevice8W
-+#define IDirectInputDevice8 IDirectInputDevice8W
-+#define IDirectInputDevice8Vtbl IDirectInputDevice8WVtbl
-+#else
-+#define IID_IDirectInputDevice8 IID_IDirectInputDevice8A
-+#define IDirectInputDevice8 IDirectInputDevice8A
-+#define IDirectInputDevice8Vtbl IDirectInputDevice8AVtbl
-+#endif
-+typedef struct IDirectInputDevice8 *LPDIRECTINPUTDEVICE8;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInputDevice8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInputDevice8_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInputDevice8_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInputDevice8_GetCapabilities(p,a) (p)->lpVtbl->GetCapabilities(p,a)
-+#define IDirectInputDevice8_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-+#define IDirectInputDevice8_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b)
-+#define IDirectInputDevice8_SetProperty(p,a,b) (p)->lpVtbl->SetProperty(p,a,b)
-+#define IDirectInputDevice8_Acquire(p) (p)->lpVtbl->Acquire(p)
-+#define IDirectInputDevice8_Unacquire(p) (p)->lpVtbl->Unacquire(p)
-+#define IDirectInputDevice8_GetDeviceState(p,a,b) (p)->lpVtbl->GetDeviceState(p,a,b)
-+#define IDirectInputDevice8_GetDeviceData(p,a,b,c,d) (p)->lpVtbl->GetDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice8_SetDataFormat(p,a) (p)->lpVtbl->SetDataFormat(p,a)
-+#define IDirectInputDevice8_SetEventNotification(p,a) (p)->lpVtbl->SetEventNotification(p,a)
-+#define IDirectInputDevice8_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectInputDevice8_GetObjectInfo(p,a,b,c) (p)->lpVtbl->GetObjectInfo(p,a,b,c)
-+#define IDirectInputDevice8_GetDeviceInfo(p,a) (p)->lpVtbl->GetDeviceInfo(p,a)
-+#define IDirectInputDevice8_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInputDevice8_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#define IDirectInputDevice8_CreateEffect(p,a,b,c,d) (p)->lpVtbl->CreateEffect(p,a,b,c,d)
-+#define IDirectInputDevice8_EnumEffects(p,a,b,c) (p)->lpVtbl->EnumEffects(p,a,b,c)
-+#define IDirectInputDevice8_GetEffectInfo(p,a,b) (p)->lpVtbl->GetEffectInfo(p,a,b)
-+#define IDirectInputDevice8_GetForceFeedbackState(p,a) (p)->lpVtbl->GetForceFeedbackState(p,a)
-+#define IDirectInputDevice8_SendForceFeedbackCommand(p,a) (p)->lpVtbl->SendForceFeedbackCommand(p,a)
-+#define IDirectInputDevice8_EnumCreatedEffectObjects(p,a,b,c) (p)->lpVtbl->EnumCreatedEffectObjects(p,a,b,c)
-+#define IDirectInputDevice8_Escape(p,a) (p)->lpVtbl->Escape(p,a)
-+#define IDirectInputDevice8_Poll(p) (p)->lpVtbl->Poll(p)
-+#define IDirectInputDevice8_SendDeviceData(p,a,b,c,d) (p)->lpVtbl->SendDeviceData(p,a,b,c,d)
-+#define IDirectInputDevice8_EnumEffectsInFile(p,a,b,c,d) (p)->lpVtbl->EnumEffectsInFile(p,a,b,c,d)
-+#define IDirectInputDevice8_WriteEffectToFile(p,a,b,c,d) (p)->lpVtbl->WriteEffectToFile(p,a,b,c,d)
-+#define IDirectInputDevice8_BuildActionMap(p,a,b,c) (p)->lpVtbl->BuildActionMap(p,a,b,c)
-+#define IDirectInputDevice8_SetActionMap(p,a,b,c) (p)->lpVtbl->SetActionMap(p,a,b,c)
-+#define IDirectInputDevice8_GetImageInfo(p,a) (p)->lpVtbl->GetImageInfo(p,a)
-+#else
-+#define IDirectInputDevice8_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInputDevice8_AddRef(p) (p)->AddRef()
-+#define IDirectInputDevice8_Release(p) (p)->Release()
-+#define IDirectInputDevice8_GetCapabilities(p,a) (p)->GetCapabilities(a)
-+#define IDirectInputDevice8_EnumObjects(p,a,b,c) (p)->EnumObjects(a,b,c)
-+#define IDirectInputDevice8_GetProperty(p,a,b) (p)->GetProperty(a,b)
-+#define IDirectInputDevice8_SetProperty(p,a,b) (p)->SetProperty(a,b)
-+#define IDirectInputDevice8_Acquire(p) (p)->Acquire()
-+#define IDirectInputDevice8_Unacquire(p) (p)->Unacquire()
-+#define IDirectInputDevice8_GetDeviceState(p,a,b) (p)->GetDeviceState(a,b)
-+#define IDirectInputDevice8_GetDeviceData(p,a,b,c,d) (p)->GetDeviceData(a,b,c,d)
-+#define IDirectInputDevice8_SetDataFormat(p,a) (p)->SetDataFormat(a)
-+#define IDirectInputDevice8_SetEventNotification(p,a) (p)->SetEventNotification(a)
-+#define IDirectInputDevice8_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectInputDevice8_GetObjectInfo(p,a,b,c) (p)->GetObjectInfo(a,b,c)
-+#define IDirectInputDevice8_GetDeviceInfo(p,a) (p)->GetDeviceInfo(a)
-+#define IDirectInputDevice8_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInputDevice8_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#define IDirectInputDevice8_CreateEffect(p,a,b,c,d) (p)->CreateEffect(a,b,c,d)
-+#define IDirectInputDevice8_EnumEffects(p,a,b,c) (p)->EnumEffects(a,b,c)
-+#define IDirectInputDevice8_GetEffectInfo(p,a,b) (p)->GetEffectInfo(a,b)
-+#define IDirectInputDevice8_GetForceFeedbackState(p,a) (p)->GetForceFeedbackState(a)
-+#define IDirectInputDevice8_SendForceFeedbackCommand(p,a) (p)->SendForceFeedbackCommand(a)
-+#define IDirectInputDevice8_EnumCreatedEffectObjects(p,a,b,c) (p)->EnumCreatedEffectObjects(a,b,c)
-+#define IDirectInputDevice8_Escape(p,a) (p)->Escape(a)
-+#define IDirectInputDevice8_Poll(p) (p)->Poll()
-+#define IDirectInputDevice8_SendDeviceData(p,a,b,c,d) (p)->SendDeviceData(a,b,c,d)
-+#define IDirectInputDevice8_EnumEffectsInFile(p,a,b,c,d) (p)->EnumEffectsInFile(a,b,c,d)
-+#define IDirectInputDevice8_WriteEffectToFile(p,a,b,c,d) (p)->WriteEffectToFile(a,b,c,d)
-+#define IDirectInputDevice8_BuildActionMap(p,a,b,c) (p)->BuildActionMap(a,b,c)
-+#define IDirectInputDevice8_SetActionMap(p,a,b,c) (p)->SetActionMap(a,b,c)
-+#define IDirectInputDevice8_GetImageInfo(p,a) (p)->GetImageInfo(a)
-+#endif
-+
-+#endif /* DIJ_RINGZERO */
-+
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+/****************************************************************************
-+ *
-+ * Mouse
-+ *
-+ ****************************************************************************/
-+
-+#ifndef DIJ_RINGZERO
-+
-+typedef struct _DIMOUSESTATE {
-+ LONG lX;
-+ LONG lY;
-+ LONG lZ;
-+ BYTE rgbButtons[4];
-+} DIMOUSESTATE, *LPDIMOUSESTATE;
-+
-+#if DIRECTINPUT_VERSION >= 0x0700
-+typedef struct _DIMOUSESTATE2 {
-+ LONG lX;
-+ LONG lY;
-+ LONG lZ;
-+ BYTE rgbButtons[8];
-+} DIMOUSESTATE2, *LPDIMOUSESTATE2;
-+#endif
-+
-+
-+#define DIMOFS_X FIELD_OFFSET(DIMOUSESTATE, lX)
-+#define DIMOFS_Y FIELD_OFFSET(DIMOUSESTATE, lY)
-+#define DIMOFS_Z FIELD_OFFSET(DIMOUSESTATE, lZ)
-+#define DIMOFS_BUTTON0 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 0)
-+#define DIMOFS_BUTTON1 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 1)
-+#define DIMOFS_BUTTON2 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 2)
-+#define DIMOFS_BUTTON3 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 3)
-+#if (DIRECTINPUT_VERSION >= 0x0700)
-+#define DIMOFS_BUTTON4 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 4)
-+#define DIMOFS_BUTTON5 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 5)
-+#define DIMOFS_BUTTON6 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 6)
-+#define DIMOFS_BUTTON7 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 7)
-+#endif
-+#endif /* DIJ_RINGZERO */
-+
-+/****************************************************************************
-+ *
-+ * Keyboard
-+ *
-+ ****************************************************************************/
-+
-+#ifndef DIJ_RINGZERO
-+
-+/****************************************************************************
-+ *
-+ * DirectInput keyboard scan codes
-+ *
-+ ****************************************************************************/
-+#define DIK_ESCAPE 0x01
-+#define DIK_1 0x02
-+#define DIK_2 0x03
-+#define DIK_3 0x04
-+#define DIK_4 0x05
-+#define DIK_5 0x06
-+#define DIK_6 0x07
-+#define DIK_7 0x08
-+#define DIK_8 0x09
-+#define DIK_9 0x0A
-+#define DIK_0 0x0B
-+#define DIK_MINUS 0x0C /* - on main keyboard */
-+#define DIK_EQUALS 0x0D
-+#define DIK_BACK 0x0E /* backspace */
-+#define DIK_TAB 0x0F
-+#define DIK_Q 0x10
-+#define DIK_W 0x11
-+#define DIK_E 0x12
-+#define DIK_R 0x13
-+#define DIK_T 0x14
-+#define DIK_Y 0x15
-+#define DIK_U 0x16
-+#define DIK_I 0x17
-+#define DIK_O 0x18
-+#define DIK_P 0x19
-+#define DIK_LBRACKET 0x1A
-+#define DIK_RBRACKET 0x1B
-+#define DIK_RETURN 0x1C /* Enter on main keyboard */
-+#define DIK_LCONTROL 0x1D
-+#define DIK_A 0x1E
-+#define DIK_S 0x1F
-+#define DIK_D 0x20
-+#define DIK_F 0x21
-+#define DIK_G 0x22
-+#define DIK_H 0x23
-+#define DIK_J 0x24
-+#define DIK_K 0x25
-+#define DIK_L 0x26
-+#define DIK_SEMICOLON 0x27
-+#define DIK_APOSTROPHE 0x28
-+#define DIK_GRAVE 0x29 /* accent grave */
-+#define DIK_LSHIFT 0x2A
-+#define DIK_BACKSLASH 0x2B
-+#define DIK_Z 0x2C
-+#define DIK_X 0x2D
-+#define DIK_C 0x2E
-+#define DIK_V 0x2F
-+#define DIK_B 0x30
-+#define DIK_N 0x31
-+#define DIK_M 0x32
-+#define DIK_COMMA 0x33
-+#define DIK_PERIOD 0x34 /* . on main keyboard */
-+#define DIK_SLASH 0x35 /* / on main keyboard */
-+#define DIK_RSHIFT 0x36
-+#define DIK_MULTIPLY 0x37 /* * on numeric keypad */
-+#define DIK_LMENU 0x38 /* left Alt */
-+#define DIK_SPACE 0x39
-+#define DIK_CAPITAL 0x3A
-+#define DIK_F1 0x3B
-+#define DIK_F2 0x3C
-+#define DIK_F3 0x3D
-+#define DIK_F4 0x3E
-+#define DIK_F5 0x3F
-+#define DIK_F6 0x40
-+#define DIK_F7 0x41
-+#define DIK_F8 0x42
-+#define DIK_F9 0x43
-+#define DIK_F10 0x44
-+#define DIK_NUMLOCK 0x45
-+#define DIK_SCROLL 0x46 /* Scroll Lock */
-+#define DIK_NUMPAD7 0x47
-+#define DIK_NUMPAD8 0x48
-+#define DIK_NUMPAD9 0x49
-+#define DIK_SUBTRACT 0x4A /* - on numeric keypad */
-+#define DIK_NUMPAD4 0x4B
-+#define DIK_NUMPAD5 0x4C
-+#define DIK_NUMPAD6 0x4D
-+#define DIK_ADD 0x4E /* + on numeric keypad */
-+#define DIK_NUMPAD1 0x4F
-+#define DIK_NUMPAD2 0x50
-+#define DIK_NUMPAD3 0x51
-+#define DIK_NUMPAD0 0x52
-+#define DIK_DECIMAL 0x53 /* . on numeric keypad */
-+#define DIK_OEM_102 0x56 /* < > | on UK/Germany keyboards */
-+#define DIK_F11 0x57
-+#define DIK_F12 0x58
-+#define DIK_F13 0x64 /* (NEC PC98) */
-+#define DIK_F14 0x65 /* (NEC PC98) */
-+#define DIK_F15 0x66 /* (NEC PC98) */
-+#define DIK_KANA 0x70 /* (Japanese keyboard) */
-+#define DIK_ABNT_C1 0x73 /* / ? on Portugese (Brazilian) keyboards */
-+#define DIK_CONVERT 0x79 /* (Japanese keyboard) */
-+#define DIK_NOCONVERT 0x7B /* (Japanese keyboard) */
-+#define DIK_YEN 0x7D /* (Japanese keyboard) */
-+#define DIK_ABNT_C2 0x7E /* Numpad . on Portugese (Brazilian) keyboards */
-+#define DIK_NUMPADEQUALS 0x8D /* = on numeric keypad (NEC PC98) */
-+#define DIK_PREVTRACK 0x90 /* Previous Track (DIK_CIRCUMFLEX on Japanese keyboard) */
-+#define DIK_AT 0x91 /* (NEC PC98) */
-+#define DIK_COLON 0x92 /* (NEC PC98) */
-+#define DIK_UNDERLINE 0x93 /* (NEC PC98) */
-+#define DIK_KANJI 0x94 /* (Japanese keyboard) */
-+#define DIK_STOP 0x95 /* (NEC PC98) */
-+#define DIK_AX 0x96 /* (Japan AX) */
-+#define DIK_UNLABELED 0x97 /* (J3100) */
-+#define DIK_NEXTTRACK 0x99 /* Next Track */
-+#define DIK_NUMPADENTER 0x9C /* Enter on numeric keypad */
-+#define DIK_RCONTROL 0x9D
-+#define DIK_MUTE 0xA0 /* Mute */
-+#define DIK_CALCULATOR 0xA1 /* Calculator */
-+#define DIK_PLAYPAUSE 0xA2 /* Play / Pause */
-+#define DIK_MEDIASTOP 0xA4 /* Media Stop */
-+#define DIK_VOLUMEDOWN 0xAE /* Volume - */
-+#define DIK_VOLUMEUP 0xB0 /* Volume + */
-+#define DIK_WEBHOME 0xB2 /* Web home */
-+#define DIK_NUMPADCOMMA 0xB3 /* , on numeric keypad (NEC PC98) */
-+#define DIK_DIVIDE 0xB5 /* / on numeric keypad */
-+#define DIK_SYSRQ 0xB7
-+#define DIK_RMENU 0xB8 /* right Alt */
-+#define DIK_PAUSE 0xC5 /* Pause */
-+#define DIK_HOME 0xC7 /* Home on arrow keypad */
-+#define DIK_UP 0xC8 /* UpArrow on arrow keypad */
-+#define DIK_PRIOR 0xC9 /* PgUp on arrow keypad */
-+#define DIK_LEFT 0xCB /* LeftArrow on arrow keypad */
-+#define DIK_RIGHT 0xCD /* RightArrow on arrow keypad */
-+#define DIK_END 0xCF /* End on arrow keypad */
-+#define DIK_DOWN 0xD0 /* DownArrow on arrow keypad */
-+#define DIK_NEXT 0xD1 /* PgDn on arrow keypad */
-+#define DIK_INSERT 0xD2 /* Insert on arrow keypad */
-+#define DIK_DELETE 0xD3 /* Delete on arrow keypad */
-+#define DIK_LWIN 0xDB /* Left Windows key */
-+#define DIK_RWIN 0xDC /* Right Windows key */
-+#define DIK_APPS 0xDD /* AppMenu key */
-+#define DIK_POWER 0xDE /* System Power */
-+#define DIK_SLEEP 0xDF /* System Sleep */
-+#define DIK_WAKE 0xE3 /* System Wake */
-+#define DIK_WEBSEARCH 0xE5 /* Web Search */
-+#define DIK_WEBFAVORITES 0xE6 /* Web Favorites */
-+#define DIK_WEBREFRESH 0xE7 /* Web Refresh */
-+#define DIK_WEBSTOP 0xE8 /* Web Stop */
-+#define DIK_WEBFORWARD 0xE9 /* Web Forward */
-+#define DIK_WEBBACK 0xEA /* Web Back */
-+#define DIK_MYCOMPUTER 0xEB /* My Computer */
-+#define DIK_MAIL 0xEC /* Mail */
-+#define DIK_MEDIASELECT 0xED /* Media Select */
-+
-+/*
-+ * Alternate names for keys, to facilitate transition from DOS.
-+ */
-+#define DIK_BACKSPACE DIK_BACK /* backspace */
-+#define DIK_NUMPADSTAR DIK_MULTIPLY /* * on numeric keypad */
-+#define DIK_LALT DIK_LMENU /* left Alt */
-+#define DIK_CAPSLOCK DIK_CAPITAL /* CapsLock */
-+#define DIK_NUMPADMINUS DIK_SUBTRACT /* - on numeric keypad */
-+#define DIK_NUMPADPLUS DIK_ADD /* + on numeric keypad */
-+#define DIK_NUMPADPERIOD DIK_DECIMAL /* . on numeric keypad */
-+#define DIK_NUMPADSLASH DIK_DIVIDE /* / on numeric keypad */
-+#define DIK_RALT DIK_RMENU /* right Alt */
-+#define DIK_UPARROW DIK_UP /* UpArrow on arrow keypad */
-+#define DIK_PGUP DIK_PRIOR /* PgUp on arrow keypad */
-+#define DIK_LEFTARROW DIK_LEFT /* LeftArrow on arrow keypad */
-+#define DIK_RIGHTARROW DIK_RIGHT /* RightArrow on arrow keypad */
-+#define DIK_DOWNARROW DIK_DOWN /* DownArrow on arrow keypad */
-+#define DIK_PGDN DIK_NEXT /* PgDn on arrow keypad */
-+
-+/*
-+ * Alternate names for keys originally not used on US keyboards.
-+ */
-+#define DIK_CIRCUMFLEX DIK_PREVTRACK /* Japanese keyboard */
-+
-+#endif /* DIJ_RINGZERO */
-+
-+/****************************************************************************
-+ *
-+ * Joystick
-+ *
-+ ****************************************************************************/
-+
-+#ifndef DIJ_RINGZERO
-+
-+typedef struct DIJOYSTATE {
-+ LONG lX; /* x-axis position */
-+ LONG lY; /* y-axis position */
-+ LONG lZ; /* z-axis position */
-+ LONG lRx; /* x-axis rotation */
-+ LONG lRy; /* y-axis rotation */
-+ LONG lRz; /* z-axis rotation */
-+ LONG rglSlider[2]; /* extra axes positions */
-+ DWORD rgdwPOV[4]; /* POV directions */
-+ BYTE rgbButtons[32]; /* 32 buttons */
-+} DIJOYSTATE, *LPDIJOYSTATE;
-+
-+typedef struct DIJOYSTATE2 {
-+ LONG lX; /* x-axis position */
-+ LONG lY; /* y-axis position */
-+ LONG lZ; /* z-axis position */
-+ LONG lRx; /* x-axis rotation */
-+ LONG lRy; /* y-axis rotation */
-+ LONG lRz; /* z-axis rotation */
-+ LONG rglSlider[2]; /* extra axes positions */
-+ DWORD rgdwPOV[4]; /* POV directions */
-+ BYTE rgbButtons[128]; /* 128 buttons */
-+ LONG lVX; /* x-axis velocity */
-+ LONG lVY; /* y-axis velocity */
-+ LONG lVZ; /* z-axis velocity */
-+ LONG lVRx; /* x-axis angular velocity */
-+ LONG lVRy; /* y-axis angular velocity */
-+ LONG lVRz; /* z-axis angular velocity */
-+ LONG rglVSlider[2]; /* extra axes velocities */
-+ LONG lAX; /* x-axis acceleration */
-+ LONG lAY; /* y-axis acceleration */
-+ LONG lAZ; /* z-axis acceleration */
-+ LONG lARx; /* x-axis angular acceleration */
-+ LONG lARy; /* y-axis angular acceleration */
-+ LONG lARz; /* z-axis angular acceleration */
-+ LONG rglASlider[2]; /* extra axes accelerations */
-+ LONG lFX; /* x-axis force */
-+ LONG lFY; /* y-axis force */
-+ LONG lFZ; /* z-axis force */
-+ LONG lFRx; /* x-axis torque */
-+ LONG lFRy; /* y-axis torque */
-+ LONG lFRz; /* z-axis torque */
-+ LONG rglFSlider[2]; /* extra axes forces */
-+} DIJOYSTATE2, *LPDIJOYSTATE2;
-+
-+#define DIJOFS_X FIELD_OFFSET(DIJOYSTATE, lX)
-+#define DIJOFS_Y FIELD_OFFSET(DIJOYSTATE, lY)
-+#define DIJOFS_Z FIELD_OFFSET(DIJOYSTATE, lZ)
-+#define DIJOFS_RX FIELD_OFFSET(DIJOYSTATE, lRx)
-+#define DIJOFS_RY FIELD_OFFSET(DIJOYSTATE, lRy)
-+#define DIJOFS_RZ FIELD_OFFSET(DIJOYSTATE, lRz)
-+#define DIJOFS_SLIDER(n) (FIELD_OFFSET(DIJOYSTATE, rglSlider) + \
-+ (n) * sizeof(LONG))
-+#define DIJOFS_POV(n) (FIELD_OFFSET(DIJOYSTATE, rgdwPOV) + \
-+ (n) * sizeof(DWORD))
-+#define DIJOFS_BUTTON(n) (FIELD_OFFSET(DIJOYSTATE, rgbButtons) + (n))
-+#define DIJOFS_BUTTON0 DIJOFS_BUTTON(0)
-+#define DIJOFS_BUTTON1 DIJOFS_BUTTON(1)
-+#define DIJOFS_BUTTON2 DIJOFS_BUTTON(2)
-+#define DIJOFS_BUTTON3 DIJOFS_BUTTON(3)
-+#define DIJOFS_BUTTON4 DIJOFS_BUTTON(4)
-+#define DIJOFS_BUTTON5 DIJOFS_BUTTON(5)
-+#define DIJOFS_BUTTON6 DIJOFS_BUTTON(6)
-+#define DIJOFS_BUTTON7 DIJOFS_BUTTON(7)
-+#define DIJOFS_BUTTON8 DIJOFS_BUTTON(8)
-+#define DIJOFS_BUTTON9 DIJOFS_BUTTON(9)
-+#define DIJOFS_BUTTON10 DIJOFS_BUTTON(10)
-+#define DIJOFS_BUTTON11 DIJOFS_BUTTON(11)
-+#define DIJOFS_BUTTON12 DIJOFS_BUTTON(12)
-+#define DIJOFS_BUTTON13 DIJOFS_BUTTON(13)
-+#define DIJOFS_BUTTON14 DIJOFS_BUTTON(14)
-+#define DIJOFS_BUTTON15 DIJOFS_BUTTON(15)
-+#define DIJOFS_BUTTON16 DIJOFS_BUTTON(16)
-+#define DIJOFS_BUTTON17 DIJOFS_BUTTON(17)
-+#define DIJOFS_BUTTON18 DIJOFS_BUTTON(18)
-+#define DIJOFS_BUTTON19 DIJOFS_BUTTON(19)
-+#define DIJOFS_BUTTON20 DIJOFS_BUTTON(20)
-+#define DIJOFS_BUTTON21 DIJOFS_BUTTON(21)
-+#define DIJOFS_BUTTON22 DIJOFS_BUTTON(22)
-+#define DIJOFS_BUTTON23 DIJOFS_BUTTON(23)
-+#define DIJOFS_BUTTON24 DIJOFS_BUTTON(24)
-+#define DIJOFS_BUTTON25 DIJOFS_BUTTON(25)
-+#define DIJOFS_BUTTON26 DIJOFS_BUTTON(26)
-+#define DIJOFS_BUTTON27 DIJOFS_BUTTON(27)
-+#define DIJOFS_BUTTON28 DIJOFS_BUTTON(28)
-+#define DIJOFS_BUTTON29 DIJOFS_BUTTON(29)
-+#define DIJOFS_BUTTON30 DIJOFS_BUTTON(30)
-+#define DIJOFS_BUTTON31 DIJOFS_BUTTON(31)
-+
-+
-+#endif /* DIJ_RINGZERO */
-+
-+/****************************************************************************
-+ *
-+ * IDirectInput
-+ *
-+ ****************************************************************************/
-+
-+#ifndef DIJ_RINGZERO
-+
-+#define DIENUM_STOP 0
-+#define DIENUM_CONTINUE 1
-+
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICESCALLBACKA)(LPCDIDEVICEINSTANCEA, LPVOID);
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICESCALLBACKW)(LPCDIDEVICEINSTANCEW, LPVOID);
-+#ifdef UNICODE
-+#define LPDIENUMDEVICESCALLBACK LPDIENUMDEVICESCALLBACKW
-+#else
-+#define LPDIENUMDEVICESCALLBACK LPDIENUMDEVICESCALLBACKA
-+#endif // !UNICODE
-+typedef BOOL (FAR PASCAL * LPDICONFIGUREDEVICESCALLBACK)(IUnknown FAR *, LPVOID);
-+
-+#define DIEDFL_ALLDEVICES 0x00000000
-+#define DIEDFL_ATTACHEDONLY 0x00000001
-+#if(DIRECTINPUT_VERSION >= 0x0500)
-+#define DIEDFL_FORCEFEEDBACK 0x00000100
-+#endif /* DIRECTINPUT_VERSION >= 0x0500 */
-+#if(DIRECTINPUT_VERSION >= 0x050a)
-+#define DIEDFL_INCLUDEALIASES 0x00010000
-+#define DIEDFL_INCLUDEPHANTOMS 0x00020000
-+#endif /* DIRECTINPUT_VERSION >= 0x050a */
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define DIEDFL_INCLUDEHIDDEN 0x00040000
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICESBYSEMANTICSCBA)(LPCDIDEVICEINSTANCEA, LPDIRECTINPUTDEVICE8A, DWORD, DWORD, LPVOID);
-+typedef BOOL (FAR PASCAL * LPDIENUMDEVICESBYSEMANTICSCBW)(LPCDIDEVICEINSTANCEW, LPDIRECTINPUTDEVICE8W, DWORD, DWORD, LPVOID);
-+#ifdef UNICODE
-+#define LPDIENUMDEVICESBYSEMANTICSCB LPDIENUMDEVICESBYSEMANTICSCBW
-+#else
-+#define LPDIENUMDEVICESBYSEMANTICSCB LPDIENUMDEVICESBYSEMANTICSCBA
-+#endif // !UNICODE
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define DIEDBS_MAPPEDPRI1 0x00000001
-+#define DIEDBS_MAPPEDPRI2 0x00000002
-+#define DIEDBS_RECENTDEVICE 0x00000010
-+#define DIEDBS_NEWDEVICE 0x00000020
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#define DIEDBSFL_ATTACHEDONLY 0x00000000
-+#define DIEDBSFL_THISUSER 0x00000010
-+#define DIEDBSFL_FORCEFEEDBACK DIEDFL_FORCEFEEDBACK
-+#define DIEDBSFL_AVAILABLEDEVICES 0x00001000
-+#define DIEDBSFL_MULTIMICEKEYBOARDS 0x00002000
-+#define DIEDBSFL_NONGAMINGDEVICES 0x00004000
-+#define DIEDBSFL_VALID 0x00007110
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputW
-+
-+DECLARE_INTERFACE_(IDirectInputW, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputW methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEW *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputW *LPDIRECTINPUTW;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInputA
-+
-+DECLARE_INTERFACE_(IDirectInputA, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputA methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEA *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+};
-+
-+typedef struct IDirectInputA *LPDIRECTINPUTA;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInput IID_IDirectInputW
-+#define IDirectInput IDirectInputW
-+#define IDirectInputVtbl IDirectInputWVtbl
-+#else
-+#define IID_IDirectInput IID_IDirectInputA
-+#define IDirectInput IDirectInputA
-+#define IDirectInputVtbl IDirectInputAVtbl
-+#endif
-+typedef struct IDirectInput *LPDIRECTINPUT;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInput_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInput_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInput_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInput_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
-+#define IDirectInput_EnumDevices(p,a,b,c,d) (p)->lpVtbl->EnumDevices(p,a,b,c,d)
-+#define IDirectInput_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a)
-+#define IDirectInput_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInput_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#else
-+#define IDirectInput_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInput_AddRef(p) (p)->AddRef()
-+#define IDirectInput_Release(p) (p)->Release()
-+#define IDirectInput_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
-+#define IDirectInput_EnumDevices(p,a,b,c,d) (p)->EnumDevices(a,b,c,d)
-+#define IDirectInput_GetDeviceStatus(p,a) (p)->GetDeviceStatus(a)
-+#define IDirectInput_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInput_Initialize(p,a,b) (p)->Initialize(a,b)
-+#endif
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInput2W
-+
-+DECLARE_INTERFACE_(IDirectInput2W, IDirectInputW)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputW methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEW *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+
-+ /*** IDirectInput2W methods ***/
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCWSTR,LPGUID) PURE;
-+};
-+
-+typedef struct IDirectInput2W *LPDIRECTINPUT2W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInput2A
-+
-+DECLARE_INTERFACE_(IDirectInput2A, IDirectInputA)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInputA methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEA *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+
-+ /*** IDirectInput2A methods ***/
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCSTR,LPGUID) PURE;
-+};
-+
-+typedef struct IDirectInput2A *LPDIRECTINPUT2A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInput2 IID_IDirectInput2W
-+#define IDirectInput2 IDirectInput2W
-+#define IDirectInput2Vtbl IDirectInput2WVtbl
-+#else
-+#define IID_IDirectInput2 IID_IDirectInput2A
-+#define IDirectInput2 IDirectInput2A
-+#define IDirectInput2Vtbl IDirectInput2AVtbl
-+#endif
-+typedef struct IDirectInput2 *LPDIRECTINPUT2;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInput2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInput2_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInput2_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInput2_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
-+#define IDirectInput2_EnumDevices(p,a,b,c,d) (p)->lpVtbl->EnumDevices(p,a,b,c,d)
-+#define IDirectInput2_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a)
-+#define IDirectInput2_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInput2_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectInput2_FindDevice(p,a,b,c) (p)->lpVtbl->FindDevice(p,a,b,c)
-+#else
-+#define IDirectInput2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInput2_AddRef(p) (p)->AddRef()
-+#define IDirectInput2_Release(p) (p)->Release()
-+#define IDirectInput2_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
-+#define IDirectInput2_EnumDevices(p,a,b,c,d) (p)->EnumDevices(a,b,c,d)
-+#define IDirectInput2_GetDeviceStatus(p,a) (p)->GetDeviceStatus(a)
-+#define IDirectInput2_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInput2_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectInput2_FindDevice(p,a,b,c) (p)->FindDevice(a,b,c)
-+#endif
-+
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInput7W
-+
-+DECLARE_INTERFACE_(IDirectInput7W, IDirectInput2W)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInput2W methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEW *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCWSTR,LPGUID) PURE;
-+
-+ /*** IDirectInput7W methods ***/
-+ STDMETHOD(CreateDeviceEx)(THIS_ REFGUID,REFIID,LPVOID *,LPUNKNOWN) PURE;
-+};
-+
-+typedef struct IDirectInput7W *LPDIRECTINPUT7W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInput7A
-+
-+DECLARE_INTERFACE_(IDirectInput7A, IDirectInput2A)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInput2A methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEA *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCSTR,LPGUID) PURE;
-+
-+ /*** IDirectInput7A methods ***/
-+ STDMETHOD(CreateDeviceEx)(THIS_ REFGUID,REFIID,LPVOID *,LPUNKNOWN) PURE;
-+};
-+
-+typedef struct IDirectInput7A *LPDIRECTINPUT7A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInput7 IID_IDirectInput7W
-+#define IDirectInput7 IDirectInput7W
-+#define IDirectInput7Vtbl IDirectInput7WVtbl
-+#else
-+#define IID_IDirectInput7 IID_IDirectInput7A
-+#define IDirectInput7 IDirectInput7A
-+#define IDirectInput7Vtbl IDirectInput7AVtbl
-+#endif
-+typedef struct IDirectInput7 *LPDIRECTINPUT7;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInput7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInput7_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInput7_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInput7_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
-+#define IDirectInput7_EnumDevices(p,a,b,c,d) (p)->lpVtbl->EnumDevices(p,a,b,c,d)
-+#define IDirectInput7_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a)
-+#define IDirectInput7_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInput7_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectInput7_FindDevice(p,a,b,c) (p)->lpVtbl->FindDevice(p,a,b,c)
-+#define IDirectInput7_CreateDeviceEx(p,a,b,c,d) (p)->lpVtbl->CreateDeviceEx(p,a,b,c,d)
-+#else
-+#define IDirectInput7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInput7_AddRef(p) (p)->AddRef()
-+#define IDirectInput7_Release(p) (p)->Release()
-+#define IDirectInput7_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
-+#define IDirectInput7_EnumDevices(p,a,b,c,d) (p)->EnumDevices(a,b,c,d)
-+#define IDirectInput7_GetDeviceStatus(p,a) (p)->GetDeviceStatus(a)
-+#define IDirectInput7_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInput7_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectInput7_FindDevice(p,a,b,c) (p)->FindDevice(a,b,c)
-+#define IDirectInput7_CreateDeviceEx(p,a,b,c,d) (p)->CreateDeviceEx(a,b,c,d)
-+#endif
-+
-+#if(DIRECTINPUT_VERSION >= 0x0800)
-+#undef INTERFACE
-+#define INTERFACE IDirectInput8W
-+
-+DECLARE_INTERFACE_(IDirectInput8W, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInput8W methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICE8W *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKW,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCWSTR,LPGUID) PURE;
-+ STDMETHOD(EnumDevicesBySemantics)(THIS_ LPCWSTR,LPDIACTIONFORMATW,LPDIENUMDEVICESBYSEMANTICSCBW,LPVOID,DWORD) PURE;
-+ STDMETHOD(ConfigureDevices)(THIS_ LPDICONFIGUREDEVICESCALLBACK,LPDICONFIGUREDEVICESPARAMSW,DWORD,LPVOID) PURE;
-+};
-+
-+typedef struct IDirectInput8W *LPDIRECTINPUT8W;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectInput8A
-+
-+DECLARE_INTERFACE_(IDirectInput8A, IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+
-+ /*** IDirectInput8A methods ***/
-+ STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICE8A *,LPUNKNOWN) PURE;
-+ STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKA,LPVOID,DWORD) PURE;
-+ STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-+ STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-+ STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-+ STDMETHOD(FindDevice)(THIS_ REFGUID,LPCSTR,LPGUID) PURE;
-+ STDMETHOD(EnumDevicesBySemantics)(THIS_ LPCSTR,LPDIACTIONFORMATA,LPDIENUMDEVICESBYSEMANTICSCBA,LPVOID,DWORD) PURE;
-+ STDMETHOD(ConfigureDevices)(THIS_ LPDICONFIGUREDEVICESCALLBACK,LPDICONFIGUREDEVICESPARAMSA,DWORD,LPVOID) PURE;
-+};
-+
-+typedef struct IDirectInput8A *LPDIRECTINPUT8A;
-+
-+#ifdef UNICODE
-+#define IID_IDirectInput8 IID_IDirectInput8W
-+#define IDirectInput8 IDirectInput8W
-+#define IDirectInput8Vtbl IDirectInput8WVtbl
-+#else
-+#define IID_IDirectInput8 IID_IDirectInput8A
-+#define IDirectInput8 IDirectInput8A
-+#define IDirectInput8Vtbl IDirectInput8AVtbl
-+#endif
-+typedef struct IDirectInput8 *LPDIRECTINPUT8;
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectInput8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectInput8_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectInput8_Release(p) (p)->lpVtbl->Release(p)
-+#define IDirectInput8_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
-+#define IDirectInput8_EnumDevices(p,a,b,c,d) (p)->lpVtbl->EnumDevices(p,a,b,c,d)
-+#define IDirectInput8_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a)
-+#define IDirectInput8_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-+#define IDirectInput8_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectInput8_FindDevice(p,a,b,c) (p)->lpVtbl->FindDevice(p,a,b,c)
-+#define IDirectInput8_EnumDevicesBySemantics(p,a,b,c,d,e) (p)->lpVtbl->EnumDevicesBySemantics(p,a,b,c,d,e)
-+#define IDirectInput8_ConfigureDevices(p,a,b,c,d) (p)->lpVtbl->ConfigureDevices(p,a,b,c,d)
-+#else
-+#define IDirectInput8_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectInput8_AddRef(p) (p)->AddRef()
-+#define IDirectInput8_Release(p) (p)->Release()
-+#define IDirectInput8_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
-+#define IDirectInput8_EnumDevices(p,a,b,c,d) (p)->EnumDevices(a,b,c,d)
-+#define IDirectInput8_GetDeviceStatus(p,a) (p)->GetDeviceStatus(a)
-+#define IDirectInput8_RunControlPanel(p,a,b) (p)->RunControlPanel(a,b)
-+#define IDirectInput8_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectInput8_FindDevice(p,a,b,c) (p)->FindDevice(a,b,c)
-+#define IDirectInput8_EnumDevicesBySemantics(p,a,b,c,d,e) (p)->EnumDevicesBySemantics(a,b,c,d,e)
-+#define IDirectInput8_ConfigureDevices(p,a,b,c,d) (p)->ConfigureDevices(a,b,c,d)
-+#endif
-+#endif /* DIRECTINPUT_VERSION >= 0x0800 */
-+
-+#if DIRECTINPUT_VERSION > 0x0700
-+
-+extern HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riidltf, LPVOID *ppvOut, LPUNKNOWN punkOuter);
-+
-+#else
-+extern HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter);
-+extern HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter);
-+#ifdef UNICODE
-+#define DirectInputCreate DirectInputCreateW
-+#else
-+#define DirectInputCreate DirectInputCreateA
-+#endif // !UNICODE
-+
-+extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFIID riidltf, LPVOID *ppvOut, LPUNKNOWN punkOuter);
-+
-+#endif /* DIRECTINPUT_VERSION > 0x700 */
-+
-+#endif /* DIJ_RINGZERO */
-+
-+
-+/****************************************************************************
-+ *
-+ * Return Codes
-+ *
-+ ****************************************************************************/
-+
-+/*
-+ * The operation completed successfully.
-+ */
-+#define DI_OK S_OK
-+
-+/*
-+ * The device exists but is not currently attached.
-+ */
-+#define DI_NOTATTACHED S_FALSE
-+
-+/*
-+ * The device buffer overflowed. Some input was lost.
-+ */
-+#define DI_BUFFEROVERFLOW S_FALSE
-+
-+/*
-+ * The change in device properties had no effect.
-+ */
-+#define DI_PROPNOEFFECT S_FALSE
-+
-+/*
-+ * The operation had no effect.
-+ */
-+#define DI_NOEFFECT S_FALSE
-+
-+/*
-+ * The device is a polled device. As a result, device buffering
-+ * will not collect any data and event notifications will not be
-+ * signalled until GetDeviceState is called.
-+ */
-+#define DI_POLLEDDEVICE ((HRESULT)0x00000002L)
-+
-+/*
-+ * The parameters of the effect were successfully updated by
-+ * IDirectInputEffect::SetParameters, but the effect was not
-+ * downloaded because the device is not exclusively acquired
-+ * or because the DIEP_NODOWNLOAD flag was passed.
-+ */
-+#define DI_DOWNLOADSKIPPED ((HRESULT)0x00000003L)
-+
-+/*
-+ * The parameters of the effect were successfully updated by
-+ * IDirectInputEffect::SetParameters, but in order to change
-+ * the parameters, the effect needed to be restarted.
-+ */
-+#define DI_EFFECTRESTARTED ((HRESULT)0x00000004L)
-+
-+/*
-+ * The parameters of the effect were successfully updated by
-+ * IDirectInputEffect::SetParameters, but some of them were
-+ * beyond the capabilities of the device and were truncated.
-+ */
-+#define DI_TRUNCATED ((HRESULT)0x00000008L)
-+
-+/*
-+ * The settings have been successfully applied but could not be
-+ * persisted.
-+ */
-+#define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000BL)
-+
-+/*
-+ * Equal to DI_EFFECTRESTARTED | DI_TRUNCATED.
-+ */
-+#define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000CL)
-+
-+/*
-+ * A SUCCESS code indicating that settings cannot be modified.
-+ */
-+#define DI_WRITEPROTECT ((HRESULT)0x00000013L)
-+
-+/*
-+ * The application requires a newer version of DirectInput.
-+ */
-+#define DIERR_OLDDIRECTINPUTVERSION \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_OLD_WIN_VERSION)
-+
-+/*
-+ * The application was written for an unsupported prerelease version
-+ * of DirectInput.
-+ */
-+#define DIERR_BETADIRECTINPUTVERSION \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_RMODE_APP)
-+
-+/*
-+ * The object could not be created due to an incompatible driver version
-+ * or mismatched or incomplete driver components.
-+ */
-+#define DIERR_BADDRIVERVER \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_BAD_DRIVER_LEVEL)
-+
-+/*
-+ * The device or device instance or effect is not registered with DirectInput.
-+ */
-+#define DIERR_DEVICENOTREG REGDB_E_CLASSNOTREG
-+
-+/*
-+ * The requested object does not exist.
-+ */
-+#define DIERR_NOTFOUND \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_FILE_NOT_FOUND)
-+
-+/*
-+ * The requested object does not exist.
-+ */
-+#define DIERR_OBJECTNOTFOUND \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_FILE_NOT_FOUND)
-+
-+/*
-+ * An invalid parameter was passed to the returning function,
-+ * or the object was not in a state that admitted the function
-+ * to be called.
-+ */
-+#define DIERR_INVALIDPARAM E_INVALIDARG
-+
-+/*
-+ * The specified interface is not supported by the object
-+ */
-+#define DIERR_NOINTERFACE E_NOINTERFACE
-+
-+/*
-+ * An undetermined error occured inside the DInput subsystem
-+ */
-+#define DIERR_GENERIC E_FAIL
-+
-+/*
-+ * The DInput subsystem couldn't allocate sufficient memory to complete the
-+ * caller's request.
-+ */
-+#define DIERR_OUTOFMEMORY E_OUTOFMEMORY
-+
-+/*
-+ * The function called is not supported at this time
-+ */
-+#define DIERR_UNSUPPORTED E_NOTIMPL
-+
-+/*
-+ * This object has not been initialized
-+ */
-+#define DIERR_NOTINITIALIZED \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_NOT_READY)
-+
-+/*
-+ * This object is already initialized
-+ */
-+#define DIERR_ALREADYINITIALIZED \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_ALREADY_INITIALIZED)
-+
-+/*
-+ * This object does not support aggregation
-+ */
-+#define DIERR_NOAGGREGATION CLASS_E_NOAGGREGATION
-+
-+/*
-+ * Another app has a higher priority level, preventing this call from
-+ * succeeding.
-+ */
-+#define DIERR_OTHERAPPHASPRIO E_ACCESSDENIED
-+
-+/*
-+ * Access to the device has been lost. It must be re-acquired.
-+ */
-+#define DIERR_INPUTLOST \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_READ_FAULT)
-+
-+/*
-+ * The operation cannot be performed while the device is acquired.
-+ */
-+#define DIERR_ACQUIRED \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_BUSY)
-+
-+/*
-+ * The operation cannot be performed unless the device is acquired.
-+ */
-+#define DIERR_NOTACQUIRED \
-+ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_INVALID_ACCESS)
-+
-+/*
-+ * The specified property cannot be changed.
-+ */
-+#define DIERR_READONLY E_ACCESSDENIED
-+
-+/*
-+ * The device already has an event notification associated with it.
-+ */
-+#define DIERR_HANDLEEXISTS E_ACCESSDENIED
-+
-+/*
-+ * Data is not yet available.
-+ */
-+#ifndef E_PENDING
-+#define E_PENDING 0x8000000AL
-+#endif
-+
-+/*
-+ * Unable to IDirectInputJoyConfig_Acquire because the user
-+ * does not have sufficient privileges to change the joystick
-+ * configuration.
-+ */
-+#define DIERR_INSUFFICIENTPRIVS 0x80040200L
-+
-+/*
-+ * The device is full.
-+ */
-+#define DIERR_DEVICEFULL 0x80040201L
-+
-+/*
-+ * Not all the requested information fit into the buffer.
-+ */
-+#define DIERR_MOREDATA 0x80040202L
-+
-+/*
-+ * The effect is not downloaded.
-+ */
-+#define DIERR_NOTDOWNLOADED 0x80040203L
-+
-+/*
-+ * The device cannot be reinitialized because there are still effects
-+ * attached to it.
-+ */
-+#define DIERR_HASEFFECTS 0x80040204L
-+
-+/*
-+ * The operation cannot be performed unless the device is acquired
-+ * in DISCL_EXCLUSIVE mode.
-+ */
-+#define DIERR_NOTEXCLUSIVEACQUIRED 0x80040205L
-+
-+/*
-+ * The effect could not be downloaded because essential information
-+ * is missing. For example, no axes have been associated with the
-+ * effect, or no type-specific information has been created.
-+ */
-+#define DIERR_INCOMPLETEEFFECT 0x80040206L
-+
-+/*
-+ * Attempted to read buffered device data from a device that is
-+ * not buffered.
-+ */
-+#define DIERR_NOTBUFFERED 0x80040207L
-+
-+/*
-+ * An attempt was made to modify parameters of an effect while it is
-+ * playing. Not all hardware devices support altering the parameters
-+ * of an effect while it is playing.
-+ */
-+#define DIERR_EFFECTPLAYING 0x80040208L
-+
-+/*
-+ * The operation could not be completed because the device is not
-+ * plugged in.
-+ */
-+#define DIERR_UNPLUGGED 0x80040209L
-+
-+/*
-+ * SendDeviceData failed because more information was requested
-+ * to be sent than can be sent to the device. Some devices have
-+ * restrictions on how much data can be sent to them. (For example,
-+ * there might be a limit on the number of buttons that can be
-+ * pressed at once.)
-+ */
-+#define DIERR_REPORTFULL 0x8004020AL
-+
-+
-+/*
-+ * A mapper file function failed because reading or writing the user or IHV
-+ * settings file failed.
-+ */
-+#define DIERR_MAPFILEFAIL 0x8004020BL
-+
-+
-+/*--- DINPUT Mapper Definitions: New for Dx8 ---*/
-+
-+
-+/*--- Keyboard
-+ Physical Keyboard Device ---*/
-+
-+#define DIKEYBOARD_ESCAPE 0x81000401
-+#define DIKEYBOARD_1 0x81000402
-+#define DIKEYBOARD_2 0x81000403
-+#define DIKEYBOARD_3 0x81000404
-+#define DIKEYBOARD_4 0x81000405
-+#define DIKEYBOARD_5 0x81000406
-+#define DIKEYBOARD_6 0x81000407
-+#define DIKEYBOARD_7 0x81000408
-+#define DIKEYBOARD_8 0x81000409
-+#define DIKEYBOARD_9 0x8100040A
-+#define DIKEYBOARD_0 0x8100040B
-+#define DIKEYBOARD_MINUS 0x8100040C /* - on main keyboard */
-+#define DIKEYBOARD_EQUALS 0x8100040D
-+#define DIKEYBOARD_BACK 0x8100040E /* backspace */
-+#define DIKEYBOARD_TAB 0x8100040F
-+#define DIKEYBOARD_Q 0x81000410
-+#define DIKEYBOARD_W 0x81000411
-+#define DIKEYBOARD_E 0x81000412
-+#define DIKEYBOARD_R 0x81000413
-+#define DIKEYBOARD_T 0x81000414
-+#define DIKEYBOARD_Y 0x81000415
-+#define DIKEYBOARD_U 0x81000416
-+#define DIKEYBOARD_I 0x81000417
-+#define DIKEYBOARD_O 0x81000418
-+#define DIKEYBOARD_P 0x81000419
-+#define DIKEYBOARD_LBRACKET 0x8100041A
-+#define DIKEYBOARD_RBRACKET 0x8100041B
-+#define DIKEYBOARD_RETURN 0x8100041C /* Enter on main keyboard */
-+#define DIKEYBOARD_LCONTROL 0x8100041D
-+#define DIKEYBOARD_A 0x8100041E
-+#define DIKEYBOARD_S 0x8100041F
-+#define DIKEYBOARD_D 0x81000420
-+#define DIKEYBOARD_F 0x81000421
-+#define DIKEYBOARD_G 0x81000422
-+#define DIKEYBOARD_H 0x81000423
-+#define DIKEYBOARD_J 0x81000424
-+#define DIKEYBOARD_K 0x81000425
-+#define DIKEYBOARD_L 0x81000426
-+#define DIKEYBOARD_SEMICOLON 0x81000427
-+#define DIKEYBOARD_APOSTROPHE 0x81000428
-+#define DIKEYBOARD_GRAVE 0x81000429 /* accent grave */
-+#define DIKEYBOARD_LSHIFT 0x8100042A
-+#define DIKEYBOARD_BACKSLASH 0x8100042B
-+#define DIKEYBOARD_Z 0x8100042C
-+#define DIKEYBOARD_X 0x8100042D
-+#define DIKEYBOARD_C 0x8100042E
-+#define DIKEYBOARD_V 0x8100042F
-+#define DIKEYBOARD_B 0x81000430
-+#define DIKEYBOARD_N 0x81000431
-+#define DIKEYBOARD_M 0x81000432
-+#define DIKEYBOARD_COMMA 0x81000433
-+#define DIKEYBOARD_PERIOD 0x81000434 /* . on main keyboard */
-+#define DIKEYBOARD_SLASH 0x81000435 /* / on main keyboard */
-+#define DIKEYBOARD_RSHIFT 0x81000436
-+#define DIKEYBOARD_MULTIPLY 0x81000437 /* * on numeric keypad */
-+#define DIKEYBOARD_LMENU 0x81000438 /* left Alt */
-+#define DIKEYBOARD_SPACE 0x81000439
-+#define DIKEYBOARD_CAPITAL 0x8100043A
-+#define DIKEYBOARD_F1 0x8100043B
-+#define DIKEYBOARD_F2 0x8100043C
-+#define DIKEYBOARD_F3 0x8100043D
-+#define DIKEYBOARD_F4 0x8100043E
-+#define DIKEYBOARD_F5 0x8100043F
-+#define DIKEYBOARD_F6 0x81000440
-+#define DIKEYBOARD_F7 0x81000441
-+#define DIKEYBOARD_F8 0x81000442
-+#define DIKEYBOARD_F9 0x81000443
-+#define DIKEYBOARD_F10 0x81000444
-+#define DIKEYBOARD_NUMLOCK 0x81000445
-+#define DIKEYBOARD_SCROLL 0x81000446 /* Scroll Lock */
-+#define DIKEYBOARD_NUMPAD7 0x81000447
-+#define DIKEYBOARD_NUMPAD8 0x81000448
-+#define DIKEYBOARD_NUMPAD9 0x81000449
-+#define DIKEYBOARD_SUBTRACT 0x8100044A /* - on numeric keypad */
-+#define DIKEYBOARD_NUMPAD4 0x8100044B
-+#define DIKEYBOARD_NUMPAD5 0x8100044C
-+#define DIKEYBOARD_NUMPAD6 0x8100044D
-+#define DIKEYBOARD_ADD 0x8100044E /* + on numeric keypad */
-+#define DIKEYBOARD_NUMPAD1 0x8100044F
-+#define DIKEYBOARD_NUMPAD2 0x81000450
-+#define DIKEYBOARD_NUMPAD3 0x81000451
-+#define DIKEYBOARD_NUMPAD0 0x81000452
-+#define DIKEYBOARD_DECIMAL 0x81000453 /* . on numeric keypad */
-+#define DIKEYBOARD_OEM_102 0x81000456 /* < > | on UK/Germany keyboards */
-+#define DIKEYBOARD_F11 0x81000457
-+#define DIKEYBOARD_F12 0x81000458
-+#define DIKEYBOARD_F13 0x81000464 /* (NEC PC98) */
-+#define DIKEYBOARD_F14 0x81000465 /* (NEC PC98) */
-+#define DIKEYBOARD_F15 0x81000466 /* (NEC PC98) */
-+#define DIKEYBOARD_KANA 0x81000470 /* (Japanese keyboard) */
-+#define DIKEYBOARD_ABNT_C1 0x81000473 /* / ? on Portugese (Brazilian) keyboards */
-+#define DIKEYBOARD_CONVERT 0x81000479 /* (Japanese keyboard) */
-+#define DIKEYBOARD_NOCONVERT 0x8100047B /* (Japanese keyboard) */
-+#define DIKEYBOARD_YEN 0x8100047D /* (Japanese keyboard) */
-+#define DIKEYBOARD_ABNT_C2 0x8100047E /* Numpad . on Portugese (Brazilian) keyboards */
-+#define DIKEYBOARD_NUMPADEQUALS 0x8100048D /* = on numeric keypad (NEC PC98) */
-+#define DIKEYBOARD_PREVTRACK 0x81000490 /* Previous Track (DIK_CIRCUMFLEX on Japanese keyboard) */
-+#define DIKEYBOARD_AT 0x81000491 /* (NEC PC98) */
-+#define DIKEYBOARD_COLON 0x81000492 /* (NEC PC98) */
-+#define DIKEYBOARD_UNDERLINE 0x81000493 /* (NEC PC98) */
-+#define DIKEYBOARD_KANJI 0x81000494 /* (Japanese keyboard) */
-+#define DIKEYBOARD_STOP 0x81000495 /* (NEC PC98) */
-+#define DIKEYBOARD_AX 0x81000496 /* (Japan AX) */
-+#define DIKEYBOARD_UNLABELED 0x81000497 /* (J3100) */
-+#define DIKEYBOARD_NEXTTRACK 0x81000499 /* Next Track */
-+#define DIKEYBOARD_NUMPADENTER 0x8100049C /* Enter on numeric keypad */
-+#define DIKEYBOARD_RCONTROL 0x8100049D
-+#define DIKEYBOARD_MUTE 0x810004A0 /* Mute */
-+#define DIKEYBOARD_CALCULATOR 0x810004A1 /* Calculator */
-+#define DIKEYBOARD_PLAYPAUSE 0x810004A2 /* Play / Pause */
-+#define DIKEYBOARD_MEDIASTOP 0x810004A4 /* Media Stop */
-+#define DIKEYBOARD_VOLUMEDOWN 0x810004AE /* Volume - */
-+#define DIKEYBOARD_VOLUMEUP 0x810004B0 /* Volume + */
-+#define DIKEYBOARD_WEBHOME 0x810004B2 /* Web home */
-+#define DIKEYBOARD_NUMPADCOMMA 0x810004B3 /* , on numeric keypad (NEC PC98) */
-+#define DIKEYBOARD_DIVIDE 0x810004B5 /* / on numeric keypad */
-+#define DIKEYBOARD_SYSRQ 0x810004B7
-+#define DIKEYBOARD_RMENU 0x810004B8 /* right Alt */
-+#define DIKEYBOARD_PAUSE 0x810004C5 /* Pause */
-+#define DIKEYBOARD_HOME 0x810004C7 /* Home on arrow keypad */
-+#define DIKEYBOARD_UP 0x810004C8 /* UpArrow on arrow keypad */
-+#define DIKEYBOARD_PRIOR 0x810004C9 /* PgUp on arrow keypad */
-+#define DIKEYBOARD_LEFT 0x810004CB /* LeftArrow on arrow keypad */
-+#define DIKEYBOARD_RIGHT 0x810004CD /* RightArrow on arrow keypad */
-+#define DIKEYBOARD_END 0x810004CF /* End on arrow keypad */
-+#define DIKEYBOARD_DOWN 0x810004D0 /* DownArrow on arrow keypad */
-+#define DIKEYBOARD_NEXT 0x810004D1 /* PgDn on arrow keypad */
-+#define DIKEYBOARD_INSERT 0x810004D2 /* Insert on arrow keypad */
-+#define DIKEYBOARD_DELETE 0x810004D3 /* Delete on arrow keypad */
-+#define DIKEYBOARD_LWIN 0x810004DB /* Left Windows key */
-+#define DIKEYBOARD_RWIN 0x810004DC /* Right Windows key */
-+#define DIKEYBOARD_APPS 0x810004DD /* AppMenu key */
-+#define DIKEYBOARD_POWER 0x810004DE /* System Power */
-+#define DIKEYBOARD_SLEEP 0x810004DF /* System Sleep */
-+#define DIKEYBOARD_WAKE 0x810004E3 /* System Wake */
-+#define DIKEYBOARD_WEBSEARCH 0x810004E5 /* Web Search */
-+#define DIKEYBOARD_WEBFAVORITES 0x810004E6 /* Web Favorites */
-+#define DIKEYBOARD_WEBREFRESH 0x810004E7 /* Web Refresh */
-+#define DIKEYBOARD_WEBSTOP 0x810004E8 /* Web Stop */
-+#define DIKEYBOARD_WEBFORWARD 0x810004E9 /* Web Forward */
-+#define DIKEYBOARD_WEBBACK 0x810004EA /* Web Back */
-+#define DIKEYBOARD_MYCOMPUTER 0x810004EB /* My Computer */
-+#define DIKEYBOARD_MAIL 0x810004EC /* Mail */
-+#define DIKEYBOARD_MEDIASELECT 0x810004ED /* Media Select */
-+
-+
-+/*--- MOUSE
-+ Physical Mouse Device ---*/
-+
-+#define DIMOUSE_XAXISAB (0x82000200 |DIMOFS_X ) /* X Axis-absolute: Some mice natively report absolute coordinates */
-+#define DIMOUSE_YAXISAB (0x82000200 |DIMOFS_Y ) /* Y Axis-absolute: Some mice natively report absolute coordinates */
-+#define DIMOUSE_XAXIS (0x82000300 |DIMOFS_X ) /* X Axis */
-+#define DIMOUSE_YAXIS (0x82000300 |DIMOFS_Y ) /* Y Axis */
-+#define DIMOUSE_WHEEL (0x82000300 |DIMOFS_Z ) /* Z Axis */
-+#define DIMOUSE_BUTTON0 (0x82000400 |DIMOFS_BUTTON0) /* Button 0 */
-+#define DIMOUSE_BUTTON1 (0x82000400 |DIMOFS_BUTTON1) /* Button 1 */
-+#define DIMOUSE_BUTTON2 (0x82000400 |DIMOFS_BUTTON2) /* Button 2 */
-+#define DIMOUSE_BUTTON3 (0x82000400 |DIMOFS_BUTTON3) /* Button 3 */
-+#define DIMOUSE_BUTTON4 (0x82000400 |DIMOFS_BUTTON4) /* Button 4 */
-+#define DIMOUSE_BUTTON5 (0x82000400 |DIMOFS_BUTTON5) /* Button 5 */
-+#define DIMOUSE_BUTTON6 (0x82000400 |DIMOFS_BUTTON6) /* Button 6 */
-+#define DIMOUSE_BUTTON7 (0x82000400 |DIMOFS_BUTTON7) /* Button 7 */
-+
-+
-+/*--- VOICE
-+ Physical Dplay Voice Device ---*/
-+
-+#define DIVOICE_CHANNEL1 0x83000401
-+#define DIVOICE_CHANNEL2 0x83000402
-+#define DIVOICE_CHANNEL3 0x83000403
-+#define DIVOICE_CHANNEL4 0x83000404
-+#define DIVOICE_CHANNEL5 0x83000405
-+#define DIVOICE_CHANNEL6 0x83000406
-+#define DIVOICE_CHANNEL7 0x83000407
-+#define DIVOICE_CHANNEL8 0x83000408
-+#define DIVOICE_TEAM 0x83000409
-+#define DIVOICE_ALL 0x8300040A
-+#define DIVOICE_RECORDMUTE 0x8300040B
-+#define DIVOICE_PLAYBACKMUTE 0x8300040C
-+#define DIVOICE_TRANSMIT 0x8300040D
-+
-+#define DIVOICE_VOICECOMMAND 0x83000410
-+
-+
-+/*--- Driving Simulator - Racing
-+ Vehicle control is primary objective ---*/
-+#define DIVIRTUAL_DRIVING_RACE 0x01000000
-+#define DIAXIS_DRIVINGR_STEER 0x01008A01 /* Steering */
-+#define DIAXIS_DRIVINGR_ACCELERATE 0x01039202 /* Accelerate */
-+#define DIAXIS_DRIVINGR_BRAKE 0x01041203 /* Brake-Axis */
-+#define DIBUTTON_DRIVINGR_SHIFTUP 0x01000C01 /* Shift to next higher gear */
-+#define DIBUTTON_DRIVINGR_SHIFTDOWN 0x01000C02 /* Shift to next lower gear */
-+#define DIBUTTON_DRIVINGR_VIEW 0x01001C03 /* Cycle through view options */
-+#define DIBUTTON_DRIVINGR_MENU 0x010004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIAXIS_DRIVINGR_ACCEL_AND_BRAKE 0x01014A04 /* Some devices combine accelerate and brake in a single axis */
-+#define DIHATSWITCH_DRIVINGR_GLANCE 0x01004601 /* Look around */
-+#define DIBUTTON_DRIVINGR_BRAKE 0x01004C04 /* Brake-button */
-+#define DIBUTTON_DRIVINGR_DASHBOARD 0x01004405 /* Select next dashboard option */
-+#define DIBUTTON_DRIVINGR_AIDS 0x01004406 /* Driver correction aids */
-+#define DIBUTTON_DRIVINGR_MAP 0x01004407 /* Display Driving Map */
-+#define DIBUTTON_DRIVINGR_BOOST 0x01004408 /* Turbo Boost */
-+#define DIBUTTON_DRIVINGR_PIT 0x01004409 /* Pit stop notification */
-+#define DIBUTTON_DRIVINGR_ACCELERATE_LINK 0x0103D4E0 /* Fallback Accelerate button */
-+#define DIBUTTON_DRIVINGR_STEER_LEFT_LINK 0x0100CCE4 /* Fallback Steer Left button */
-+#define DIBUTTON_DRIVINGR_STEER_RIGHT_LINK 0x0100CCEC /* Fallback Steer Right button */
-+#define DIBUTTON_DRIVINGR_GLANCE_LEFT_LINK 0x0107C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_DRIVINGR_GLANCE_RIGHT_LINK 0x0107C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_DRIVINGR_DEVICE 0x010044FE /* Show input device and controls */
-+#define DIBUTTON_DRIVINGR_PAUSE 0x010044FC /* Start / Pause / Restart game */
-+
-+/*--- Driving Simulator - Combat
-+ Combat from within a vehicle is primary objective ---*/
-+#define DIVIRTUAL_DRIVING_COMBAT 0x02000000
-+#define DIAXIS_DRIVINGC_STEER 0x02008A01 /* Steering */
-+#define DIAXIS_DRIVINGC_ACCELERATE 0x02039202 /* Accelerate */
-+#define DIAXIS_DRIVINGC_BRAKE 0x02041203 /* Brake-axis */
-+#define DIBUTTON_DRIVINGC_FIRE 0x02000C01 /* Fire */
-+#define DIBUTTON_DRIVINGC_WEAPONS 0x02000C02 /* Select next weapon */
-+#define DIBUTTON_DRIVINGC_TARGET 0x02000C03 /* Select next available target */
-+#define DIBUTTON_DRIVINGC_MENU 0x020004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIAXIS_DRIVINGC_ACCEL_AND_BRAKE 0x02014A04 /* Some devices combine accelerate and brake in a single axis */
-+#define DIHATSWITCH_DRIVINGC_GLANCE 0x02004601 /* Look around */
-+#define DIBUTTON_DRIVINGC_SHIFTUP 0x02004C04 /* Shift to next higher gear */
-+#define DIBUTTON_DRIVINGC_SHIFTDOWN 0x02004C05 /* Shift to next lower gear */
-+#define DIBUTTON_DRIVINGC_DASHBOARD 0x02004406 /* Select next dashboard option */
-+#define DIBUTTON_DRIVINGC_AIDS 0x02004407 /* Driver correction aids */
-+#define DIBUTTON_DRIVINGC_BRAKE 0x02004C08 /* Brake-button */
-+#define DIBUTTON_DRIVINGC_FIRESECONDARY 0x02004C09 /* Alternative fire button */
-+#define DIBUTTON_DRIVINGC_ACCELERATE_LINK 0x0203D4E0 /* Fallback Accelerate button */
-+#define DIBUTTON_DRIVINGC_STEER_LEFT_LINK 0x0200CCE4 /* Fallback Steer Left button */
-+#define DIBUTTON_DRIVINGC_STEER_RIGHT_LINK 0x0200CCEC /* Fallback Steer Right button */
-+#define DIBUTTON_DRIVINGC_GLANCE_LEFT_LINK 0x0207C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_DRIVINGC_GLANCE_RIGHT_LINK 0x0207C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_DRIVINGC_DEVICE 0x020044FE /* Show input device and controls */
-+#define DIBUTTON_DRIVINGC_PAUSE 0x020044FC /* Start / Pause / Restart game */
-+
-+/*--- Driving Simulator - Tank
-+ Combat from withing a tank is primary objective ---*/
-+#define DIVIRTUAL_DRIVING_TANK 0x03000000
-+#define DIAXIS_DRIVINGT_STEER 0x03008A01 /* Turn tank left / right */
-+#define DIAXIS_DRIVINGT_BARREL 0x03010202 /* Raise / lower barrel */
-+#define DIAXIS_DRIVINGT_ACCELERATE 0x03039203 /* Accelerate */
-+#define DIAXIS_DRIVINGT_ROTATE 0x03020204 /* Turn barrel left / right */
-+#define DIBUTTON_DRIVINGT_FIRE 0x03000C01 /* Fire */
-+#define DIBUTTON_DRIVINGT_WEAPONS 0x03000C02 /* Select next weapon */
-+#define DIBUTTON_DRIVINGT_TARGET 0x03000C03 /* Selects next available target */
-+#define DIBUTTON_DRIVINGT_MENU 0x030004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_DRIVINGT_GLANCE 0x03004601 /* Look around */
-+#define DIAXIS_DRIVINGT_BRAKE 0x03045205 /* Brake-axis */
-+#define DIAXIS_DRIVINGT_ACCEL_AND_BRAKE 0x03014A06 /* Some devices combine accelerate and brake in a single axis */
-+#define DIBUTTON_DRIVINGT_VIEW 0x03005C04 /* Cycle through view options */
-+#define DIBUTTON_DRIVINGT_DASHBOARD 0x03005C05 /* Select next dashboard option */
-+#define DIBUTTON_DRIVINGT_BRAKE 0x03004C06 /* Brake-button */
-+#define DIBUTTON_DRIVINGT_FIRESECONDARY 0x03004C07 /* Alternative fire button */
-+#define DIBUTTON_DRIVINGT_ACCELERATE_LINK 0x0303D4E0 /* Fallback Accelerate button */
-+#define DIBUTTON_DRIVINGT_STEER_LEFT_LINK 0x0300CCE4 /* Fallback Steer Left button */
-+#define DIBUTTON_DRIVINGT_STEER_RIGHT_LINK 0x0300CCEC /* Fallback Steer Right button */
-+#define DIBUTTON_DRIVINGT_BARREL_UP_LINK 0x030144E0 /* Fallback Barrel up button */
-+#define DIBUTTON_DRIVINGT_BARREL_DOWN_LINK 0x030144E8 /* Fallback Barrel down button */
-+#define DIBUTTON_DRIVINGT_ROTATE_LEFT_LINK 0x030244E4 /* Fallback Rotate left button */
-+#define DIBUTTON_DRIVINGT_ROTATE_RIGHT_LINK 0x030244EC /* Fallback Rotate right button */
-+#define DIBUTTON_DRIVINGT_GLANCE_LEFT_LINK 0x0307C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_DRIVINGT_GLANCE_RIGHT_LINK 0x0307C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_DRIVINGT_DEVICE 0x030044FE /* Show input device and controls */
-+#define DIBUTTON_DRIVINGT_PAUSE 0x030044FC /* Start / Pause / Restart game */
-+
-+/*--- Flight Simulator - Civilian
-+ Plane control is the primary objective ---*/
-+#define DIVIRTUAL_FLYING_CIVILIAN 0x04000000
-+#define DIAXIS_FLYINGC_BANK 0x04008A01 /* Roll ship left / right */
-+#define DIAXIS_FLYINGC_PITCH 0x04010A02 /* Nose up / down */
-+#define DIAXIS_FLYINGC_THROTTLE 0x04039203 /* Throttle */
-+#define DIBUTTON_FLYINGC_VIEW 0x04002401 /* Cycle through view options */
-+#define DIBUTTON_FLYINGC_DISPLAY 0x04002402 /* Select next dashboard / heads up display option */
-+#define DIBUTTON_FLYINGC_GEAR 0x04002C03 /* Gear up / down */
-+#define DIBUTTON_FLYINGC_MENU 0x040004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_FLYINGC_GLANCE 0x04004601 /* Look around */
-+#define DIAXIS_FLYINGC_BRAKE 0x04046A04 /* Apply Brake */
-+#define DIAXIS_FLYINGC_RUDDER 0x04025205 /* Yaw ship left/right */
-+#define DIAXIS_FLYINGC_FLAPS 0x04055A06 /* Flaps */
-+#define DIBUTTON_FLYINGC_FLAPSUP 0x04006404 /* Increment stepping up until fully retracted */
-+#define DIBUTTON_FLYINGC_FLAPSDOWN 0x04006405 /* Decrement stepping down until fully extended */
-+#define DIBUTTON_FLYINGC_BRAKE_LINK 0x04046CE0 /* Fallback brake button */
-+#define DIBUTTON_FLYINGC_FASTER_LINK 0x0403D4E0 /* Fallback throttle up button */
-+#define DIBUTTON_FLYINGC_SLOWER_LINK 0x0403D4E8 /* Fallback throttle down button */
-+#define DIBUTTON_FLYINGC_GLANCE_LEFT_LINK 0x0407C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_FLYINGC_GLANCE_RIGHT_LINK 0x0407C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_FLYINGC_GLANCE_UP_LINK 0x0407C4E0 /* Fallback Glance Up button */
-+#define DIBUTTON_FLYINGC_GLANCE_DOWN_LINK 0x0407C4E8 /* Fallback Glance Down button */
-+#define DIBUTTON_FLYINGC_DEVICE 0x040044FE /* Show input device and controls */
-+#define DIBUTTON_FLYINGC_PAUSE 0x040044FC /* Start / Pause / Restart game */
-+
-+/*--- Flight Simulator - Military
-+ Aerial combat is the primary objective ---*/
-+#define DIVIRTUAL_FLYING_MILITARY 0x05000000
-+#define DIAXIS_FLYINGM_BANK 0x05008A01 /* Bank - Roll ship left / right */
-+#define DIAXIS_FLYINGM_PITCH 0x05010A02 /* Pitch - Nose up / down */
-+#define DIAXIS_FLYINGM_THROTTLE 0x05039203 /* Throttle - faster / slower */
-+#define DIBUTTON_FLYINGM_FIRE 0x05000C01 /* Fire */
-+#define DIBUTTON_FLYINGM_WEAPONS 0x05000C02 /* Select next weapon */
-+#define DIBUTTON_FLYINGM_TARGET 0x05000C03 /* Selects next available target */
-+#define DIBUTTON_FLYINGM_MENU 0x050004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_FLYINGM_GLANCE 0x05004601 /* Look around */
-+#define DIBUTTON_FLYINGM_COUNTER 0x05005C04 /* Activate counter measures */
-+#define DIAXIS_FLYINGM_RUDDER 0x05024A04 /* Rudder - Yaw ship left/right */
-+#define DIAXIS_FLYINGM_BRAKE 0x05046205 /* Brake-axis */
-+#define DIBUTTON_FLYINGM_VIEW 0x05006405 /* Cycle through view options */
-+#define DIBUTTON_FLYINGM_DISPLAY 0x05006406 /* Select next dashboard option */
-+#define DIAXIS_FLYINGM_FLAPS 0x05055206 /* Flaps */
-+#define DIBUTTON_FLYINGM_FLAPSUP 0x05005407 /* Increment stepping up until fully retracted */
-+#define DIBUTTON_FLYINGM_FLAPSDOWN 0x05005408 /* Decrement stepping down until fully extended */
-+#define DIBUTTON_FLYINGM_FIRESECONDARY 0x05004C09 /* Alternative fire button */
-+#define DIBUTTON_FLYINGM_GEAR 0x0500640A /* Gear up / down */
-+#define DIBUTTON_FLYINGM_BRAKE_LINK 0x050464E0 /* Fallback brake button */
-+#define DIBUTTON_FLYINGM_FASTER_LINK 0x0503D4E0 /* Fallback throttle up button */
-+#define DIBUTTON_FLYINGM_SLOWER_LINK 0x0503D4E8 /* Fallback throttle down button */
-+#define DIBUTTON_FLYINGM_GLANCE_LEFT_LINK 0x0507C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_FLYINGM_GLANCE_RIGHT_LINK 0x0507C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_FLYINGM_GLANCE_UP_LINK 0x0507C4E0 /* Fallback Glance Up button */
-+#define DIBUTTON_FLYINGM_GLANCE_DOWN_LINK 0x0507C4E8 /* Fallback Glance Down button */
-+#define DIBUTTON_FLYINGM_DEVICE 0x050044FE /* Show input device and controls */
-+#define DIBUTTON_FLYINGM_PAUSE 0x050044FC /* Start / Pause / Restart game */
-+
-+/*--- Flight Simulator - Combat Helicopter
-+ Combat from helicopter is primary objective ---*/
-+#define DIVIRTUAL_FLYING_HELICOPTER 0x06000000
-+#define DIAXIS_FLYINGH_BANK 0x06008A01 /* Bank - Roll ship left / right */
-+#define DIAXIS_FLYINGH_PITCH 0x06010A02 /* Pitch - Nose up / down */
-+#define DIAXIS_FLYINGH_COLLECTIVE 0x06018A03 /* Collective - Blade pitch/power */
-+#define DIBUTTON_FLYINGH_FIRE 0x06001401 /* Fire */
-+#define DIBUTTON_FLYINGH_WEAPONS 0x06001402 /* Select next weapon */
-+#define DIBUTTON_FLYINGH_TARGET 0x06001403 /* Selects next available target */
-+#define DIBUTTON_FLYINGH_MENU 0x060004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_FLYINGH_GLANCE 0x06004601 /* Look around */
-+#define DIAXIS_FLYINGH_TORQUE 0x06025A04 /* Torque - Rotate ship around left / right axis */
-+#define DIAXIS_FLYINGH_THROTTLE 0x0603DA05 /* Throttle */
-+#define DIBUTTON_FLYINGH_COUNTER 0x06005404 /* Activate counter measures */
-+#define DIBUTTON_FLYINGH_VIEW 0x06006405 /* Cycle through view options */
-+#define DIBUTTON_FLYINGH_GEAR 0x06006406 /* Gear up / down */
-+#define DIBUTTON_FLYINGH_FIRESECONDARY 0x06004C07 /* Alternative fire button */
-+#define DIBUTTON_FLYINGH_FASTER_LINK 0x0603DCE0 /* Fallback throttle up button */
-+#define DIBUTTON_FLYINGH_SLOWER_LINK 0x0603DCE8 /* Fallback throttle down button */
-+#define DIBUTTON_FLYINGH_GLANCE_LEFT_LINK 0x0607C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_FLYINGH_GLANCE_RIGHT_LINK 0x0607C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607C4E0 /* Fallback Glance Up button */
-+#define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607C4E8 /* Fallback Glance Down button */
-+#define DIBUTTON_FLYINGH_DEVICE 0x060044FE /* Show input device and controls */
-+#define DIBUTTON_FLYINGH_PAUSE 0x060044FC /* Start / Pause / Restart game */
-+
-+/*--- Space Simulator - Combat
-+ Space Simulator with weapons ---*/
-+#define DIVIRTUAL_SPACESIM 0x07000000
-+#define DIAXIS_SPACESIM_LATERAL 0x07008201 /* Move ship left / right */
-+#define DIAXIS_SPACESIM_MOVE 0x07010202 /* Move ship forward/backward */
-+#define DIAXIS_SPACESIM_THROTTLE 0x07038203 /* Throttle - Engine speed */
-+#define DIBUTTON_SPACESIM_FIRE 0x07000401 /* Fire */
-+#define DIBUTTON_SPACESIM_WEAPONS 0x07000402 /* Select next weapon */
-+#define DIBUTTON_SPACESIM_TARGET 0x07000403 /* Selects next available target */
-+#define DIBUTTON_SPACESIM_MENU 0x070004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_SPACESIM_GLANCE 0x07004601 /* Look around */
-+#define DIAXIS_SPACESIM_CLIMB 0x0701C204 /* Climb - Pitch ship up/down */
-+#define DIAXIS_SPACESIM_ROTATE 0x07024205 /* Rotate - Turn ship left/right */
-+#define DIBUTTON_SPACESIM_VIEW 0x07004404 /* Cycle through view options */
-+#define DIBUTTON_SPACESIM_DISPLAY 0x07004405 /* Select next dashboard / heads up display option */
-+#define DIBUTTON_SPACESIM_RAISE 0x07004406 /* Raise ship while maintaining current pitch */
-+#define DIBUTTON_SPACESIM_LOWER 0x07004407 /* Lower ship while maintaining current pitch */
-+#define DIBUTTON_SPACESIM_GEAR 0x07004408 /* Gear up / down */
-+#define DIBUTTON_SPACESIM_FIRESECONDARY 0x07004409 /* Alternative fire button */
-+#define DIBUTTON_SPACESIM_LEFT_LINK 0x0700C4E4 /* Fallback move left button */
-+#define DIBUTTON_SPACESIM_RIGHT_LINK 0x0700C4EC /* Fallback move right button */
-+#define DIBUTTON_SPACESIM_FORWARD_LINK 0x070144E0 /* Fallback move forward button */
-+#define DIBUTTON_SPACESIM_BACKWARD_LINK 0x070144E8 /* Fallback move backwards button */
-+#define DIBUTTON_SPACESIM_FASTER_LINK 0x0703C4E0 /* Fallback throttle up button */
-+#define DIBUTTON_SPACESIM_SLOWER_LINK 0x0703C4E8 /* Fallback throttle down button */
-+#define DIBUTTON_SPACESIM_TURN_LEFT_LINK 0x070244E4 /* Fallback turn left button */
-+#define DIBUTTON_SPACESIM_TURN_RIGHT_LINK 0x070244EC /* Fallback turn right button */
-+#define DIBUTTON_SPACESIM_GLANCE_LEFT_LINK 0x0707C4E4 /* Fallback Glance Left button */
-+#define DIBUTTON_SPACESIM_GLANCE_RIGHT_LINK 0x0707C4EC /* Fallback Glance Right button */
-+#define DIBUTTON_SPACESIM_GLANCE_UP_LINK 0x0707C4E0 /* Fallback Glance Up button */
-+#define DIBUTTON_SPACESIM_GLANCE_DOWN_LINK 0x0707C4E8 /* Fallback Glance Down button */
-+#define DIBUTTON_SPACESIM_DEVICE 0x070044FE /* Show input device and controls */
-+#define DIBUTTON_SPACESIM_PAUSE 0x070044FC /* Start / Pause / Restart game */
-+
-+/*--- Fighting - First Person
-+ Hand to Hand combat is primary objective ---*/
-+#define DIVIRTUAL_FIGHTING_HAND2HAND 0x08000000
-+#define DIAXIS_FIGHTINGH_LATERAL 0x08008201 /* Sidestep left/right */
-+#define DIAXIS_FIGHTINGH_MOVE 0x08010202 /* Move forward/backward */
-+#define DIBUTTON_FIGHTINGH_PUNCH 0x08000401 /* Punch */
-+#define DIBUTTON_FIGHTINGH_KICK 0x08000402 /* Kick */
-+#define DIBUTTON_FIGHTINGH_BLOCK 0x08000403 /* Block */
-+#define DIBUTTON_FIGHTINGH_CROUCH 0x08000404 /* Crouch */
-+#define DIBUTTON_FIGHTINGH_JUMP 0x08000405 /* Jump */
-+#define DIBUTTON_FIGHTINGH_SPECIAL1 0x08000406 /* Apply first special move */
-+#define DIBUTTON_FIGHTINGH_SPECIAL2 0x08000407 /* Apply second special move */
-+#define DIBUTTON_FIGHTINGH_MENU 0x080004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_FIGHTINGH_SELECT 0x08004408 /* Select special move */
-+#define DIHATSWITCH_FIGHTINGH_SLIDE 0x08004601 /* Look around */
-+#define DIBUTTON_FIGHTINGH_DISPLAY 0x08004409 /* Shows next on-screen display option */
-+#define DIAXIS_FIGHTINGH_ROTATE 0x08024203 /* Rotate - Turn body left/right */
-+#define DIBUTTON_FIGHTINGH_DODGE 0x0800440A /* Dodge */
-+#define DIBUTTON_FIGHTINGH_LEFT_LINK 0x0800C4E4 /* Fallback left sidestep button */
-+#define DIBUTTON_FIGHTINGH_RIGHT_LINK 0x0800C4EC /* Fallback right sidestep button */
-+#define DIBUTTON_FIGHTINGH_FORWARD_LINK 0x080144E0 /* Fallback forward button */
-+#define DIBUTTON_FIGHTINGH_BACKWARD_LINK 0x080144E8 /* Fallback backward button */
-+#define DIBUTTON_FIGHTINGH_DEVICE 0x080044FE /* Show input device and controls */
-+#define DIBUTTON_FIGHTINGH_PAUSE 0x080044FC /* Start / Pause / Restart game */
-+
-+/*--- Fighting - First Person Shooting
-+ Navigation and combat are primary objectives ---*/
-+#define DIVIRTUAL_FIGHTING_FPS 0x09000000
-+#define DIAXIS_FPS_ROTATE 0x09008201 /* Rotate character left/right */
-+#define DIAXIS_FPS_MOVE 0x09010202 /* Move forward/backward */
-+#define DIBUTTON_FPS_FIRE 0x09000401 /* Fire */
-+#define DIBUTTON_FPS_WEAPONS 0x09000402 /* Select next weapon */
-+#define DIBUTTON_FPS_APPLY 0x09000403 /* Use item */
-+#define DIBUTTON_FPS_SELECT 0x09000404 /* Select next inventory item */
-+#define DIBUTTON_FPS_CROUCH 0x09000405 /* Crouch/ climb down/ swim down */
-+#define DIBUTTON_FPS_JUMP 0x09000406 /* Jump/ climb up/ swim up */
-+#define DIAXIS_FPS_LOOKUPDOWN 0x09018203 /* Look up / down */
-+#define DIBUTTON_FPS_STRAFE 0x09000407 /* Enable strafing while active */
-+#define DIBUTTON_FPS_MENU 0x090004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_FPS_GLANCE 0x09004601 /* Look around */
-+#define DIBUTTON_FPS_DISPLAY 0x09004408 /* Shows next on-screen display option/ map */
-+#define DIAXIS_FPS_SIDESTEP 0x09024204 /* Sidestep */
-+#define DIBUTTON_FPS_DODGE 0x09004409 /* Dodge */
-+#define DIBUTTON_FPS_GLANCEL 0x0900440A /* Glance Left */
-+#define DIBUTTON_FPS_GLANCER 0x0900440B /* Glance Right */
-+#define DIBUTTON_FPS_FIRESECONDARY 0x0900440C /* Alternative fire button */
-+#define DIBUTTON_FPS_ROTATE_LEFT_LINK 0x0900C4E4 /* Fallback rotate left button */
-+#define DIBUTTON_FPS_ROTATE_RIGHT_LINK 0x0900C4EC /* Fallback rotate right button */
-+#define DIBUTTON_FPS_FORWARD_LINK 0x090144E0 /* Fallback forward button */
-+#define DIBUTTON_FPS_BACKWARD_LINK 0x090144E8 /* Fallback backward button */
-+#define DIBUTTON_FPS_GLANCE_UP_LINK 0x0901C4E0 /* Fallback look up button */
-+#define DIBUTTON_FPS_GLANCE_DOWN_LINK 0x0901C4E8 /* Fallback look down button */
-+#define DIBUTTON_FPS_DEVICE 0x090044FE /* Show input device and controls */
-+#define DIBUTTON_FPS_PAUSE 0x090044FC /* Start / Pause / Restart game */
-+
-+/*--- Fighting - Third Person action
-+ Perspective of camera is behind the main character ---*/
-+#define DIVIRTUAL_FIGHTING_THIRDPERSON 0x0A000000
-+#define DIAXIS_TPS_TURN 0x0A020201 /* Turn left/right */
-+#define DIAXIS_TPS_MOVE 0x0A010202 /* Move forward/backward */
-+#define DIBUTTON_TPS_RUN 0x0A000401 /* Run or walk toggle switch */
-+#define DIBUTTON_TPS_ACTION 0x0A000402 /* Action Button */
-+#define DIBUTTON_TPS_SELECT 0x0A000403 /* Select next weapon */
-+#define DIBUTTON_TPS_USE 0x0A000404 /* Use inventory item currently selected */
-+#define DIBUTTON_TPS_JUMP 0x0A000405 /* Character Jumps */
-+#define DIBUTTON_TPS_MENU 0x0A0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_TPS_GLANCE 0x0A004601 /* Look around */
-+#define DIBUTTON_TPS_VIEW 0x0A004406 /* Select camera view */
-+#define DIBUTTON_TPS_STEPLEFT 0x0A004407 /* Character takes a left step */
-+#define DIBUTTON_TPS_STEPRIGHT 0x0A004408 /* Character takes a right step */
-+#define DIAXIS_TPS_STEP 0x0A00C203 /* Character steps left/right */
-+#define DIBUTTON_TPS_DODGE 0x0A004409 /* Character dodges or ducks */
-+#define DIBUTTON_TPS_INVENTORY 0x0A00440A /* Cycle through inventory */
-+#define DIBUTTON_TPS_TURN_LEFT_LINK 0x0A0244E4 /* Fallback turn left button */
-+#define DIBUTTON_TPS_TURN_RIGHT_LINK 0x0A0244EC /* Fallback turn right button */
-+#define DIBUTTON_TPS_FORWARD_LINK 0x0A0144E0 /* Fallback forward button */
-+#define DIBUTTON_TPS_BACKWARD_LINK 0x0A0144E8 /* Fallback backward button */
-+#define DIBUTTON_TPS_GLANCE_UP_LINK 0x0A07C4E0 /* Fallback look up button */
-+#define DIBUTTON_TPS_GLANCE_DOWN_LINK 0x0A07C4E8 /* Fallback look down button */
-+#define DIBUTTON_TPS_GLANCE_LEFT_LINK 0x0A07C4E4 /* Fallback glance up button */
-+#define DIBUTTON_TPS_GLANCE_RIGHT_LINK 0x0A07C4EC /* Fallback glance right button */
-+#define DIBUTTON_TPS_DEVICE 0x0A0044FE /* Show input device and controls */
-+#define DIBUTTON_TPS_PAUSE 0x0A0044FC /* Start / Pause / Restart game */
-+
-+/*--- Strategy - Role Playing
-+ Navigation and problem solving are primary actions ---*/
-+#define DIVIRTUAL_STRATEGY_ROLEPLAYING 0x0B000000
-+#define DIAXIS_STRATEGYR_LATERAL 0x0B008201 /* sidestep - left/right */
-+#define DIAXIS_STRATEGYR_MOVE 0x0B010202 /* move forward/backward */
-+#define DIBUTTON_STRATEGYR_GET 0x0B000401 /* Acquire item */
-+#define DIBUTTON_STRATEGYR_APPLY 0x0B000402 /* Use selected item */
-+#define DIBUTTON_STRATEGYR_SELECT 0x0B000403 /* Select nextitem */
-+#define DIBUTTON_STRATEGYR_ATTACK 0x0B000404 /* Attack */
-+#define DIBUTTON_STRATEGYR_CAST 0x0B000405 /* Cast Spell */
-+#define DIBUTTON_STRATEGYR_CROUCH 0x0B000406 /* Crouch */
-+#define DIBUTTON_STRATEGYR_JUMP 0x0B000407 /* Jump */
-+#define DIBUTTON_STRATEGYR_MENU 0x0B0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_STRATEGYR_GLANCE 0x0B004601 /* Look around */
-+#define DIBUTTON_STRATEGYR_MAP 0x0B004408 /* Cycle through map options */
-+#define DIBUTTON_STRATEGYR_DISPLAY 0x0B004409 /* Shows next on-screen display option */
-+#define DIAXIS_STRATEGYR_ROTATE 0x0B024203 /* Turn body left/right */
-+#define DIBUTTON_STRATEGYR_LEFT_LINK 0x0B00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_STRATEGYR_RIGHT_LINK 0x0B00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_STRATEGYR_FORWARD_LINK 0x0B0144E0 /* Fallback move forward button */
-+#define DIBUTTON_STRATEGYR_BACK_LINK 0x0B0144E8 /* Fallback move backward button */
-+#define DIBUTTON_STRATEGYR_ROTATE_LEFT_LINK 0x0B0244E4 /* Fallback turn body left button */
-+#define DIBUTTON_STRATEGYR_ROTATE_RIGHT_LINK 0x0B0244EC /* Fallback turn body right button */
-+#define DIBUTTON_STRATEGYR_DEVICE 0x0B0044FE /* Show input device and controls */
-+#define DIBUTTON_STRATEGYR_PAUSE 0x0B0044FC /* Start / Pause / Restart game */
-+
-+/*--- Strategy - Turn based
-+ Navigation and problem solving are primary actions ---*/
-+#define DIVIRTUAL_STRATEGY_TURN 0x0C000000
-+#define DIAXIS_STRATEGYT_LATERAL 0x0C008201 /* Sidestep left/right */
-+#define DIAXIS_STRATEGYT_MOVE 0x0C010202 /* Move forward/backwards */
-+#define DIBUTTON_STRATEGYT_SELECT 0x0C000401 /* Select unit or object */
-+#define DIBUTTON_STRATEGYT_INSTRUCT 0x0C000402 /* Cycle through instructions */
-+#define DIBUTTON_STRATEGYT_APPLY 0x0C000403 /* Apply selected instruction */
-+#define DIBUTTON_STRATEGYT_TEAM 0x0C000404 /* Select next team / cycle through all */
-+#define DIBUTTON_STRATEGYT_TURN 0x0C000405 /* Indicate turn over */
-+#define DIBUTTON_STRATEGYT_MENU 0x0C0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_STRATEGYT_ZOOM 0x0C004406 /* Zoom - in / out */
-+#define DIBUTTON_STRATEGYT_MAP 0x0C004407 /* cycle through map options */
-+#define DIBUTTON_STRATEGYT_DISPLAY 0x0C004408 /* shows next on-screen display options */
-+#define DIBUTTON_STRATEGYT_LEFT_LINK 0x0C00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_STRATEGYT_RIGHT_LINK 0x0C00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_STRATEGYT_FORWARD_LINK 0x0C0144E0 /* Fallback move forward button */
-+#define DIBUTTON_STRATEGYT_BACK_LINK 0x0C0144E8 /* Fallback move back button */
-+#define DIBUTTON_STRATEGYT_DEVICE 0x0C0044FE /* Show input device and controls */
-+#define DIBUTTON_STRATEGYT_PAUSE 0x0C0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Hunting
-+ Hunting ---*/
-+#define DIVIRTUAL_SPORTS_HUNTING 0x0D000000
-+#define DIAXIS_HUNTING_LATERAL 0x0D008201 /* sidestep left/right */
-+#define DIAXIS_HUNTING_MOVE 0x0D010202 /* move forward/backwards */
-+#define DIBUTTON_HUNTING_FIRE 0x0D000401 /* Fire selected weapon */
-+#define DIBUTTON_HUNTING_AIM 0x0D000402 /* Select aim/move */
-+#define DIBUTTON_HUNTING_WEAPON 0x0D000403 /* Select next weapon */
-+#define DIBUTTON_HUNTING_BINOCULAR 0x0D000404 /* Look through Binoculars */
-+#define DIBUTTON_HUNTING_CALL 0x0D000405 /* Make animal call */
-+#define DIBUTTON_HUNTING_MAP 0x0D000406 /* View Map */
-+#define DIBUTTON_HUNTING_SPECIAL 0x0D000407 /* Special game operation */
-+#define DIBUTTON_HUNTING_MENU 0x0D0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_HUNTING_GLANCE 0x0D004601 /* Look around */
-+#define DIBUTTON_HUNTING_DISPLAY 0x0D004408 /* show next on-screen display option */
-+#define DIAXIS_HUNTING_ROTATE 0x0D024203 /* Turn body left/right */
-+#define DIBUTTON_HUNTING_CROUCH 0x0D004409 /* Crouch/ Climb / Swim down */
-+#define DIBUTTON_HUNTING_JUMP 0x0D00440A /* Jump/ Climb up / Swim up */
-+#define DIBUTTON_HUNTING_FIRESECONDARY 0x0D00440B /* Alternative fire button */
-+#define DIBUTTON_HUNTING_LEFT_LINK 0x0D00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_HUNTING_RIGHT_LINK 0x0D00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_HUNTING_FORWARD_LINK 0x0D0144E0 /* Fallback move forward button */
-+#define DIBUTTON_HUNTING_BACK_LINK 0x0D0144E8 /* Fallback move back button */
-+#define DIBUTTON_HUNTING_ROTATE_LEFT_LINK 0x0D0244E4 /* Fallback turn body left button */
-+#define DIBUTTON_HUNTING_ROTATE_RIGHT_LINK 0x0D0244EC /* Fallback turn body right button */
-+#define DIBUTTON_HUNTING_DEVICE 0x0D0044FE /* Show input device and controls */
-+#define DIBUTTON_HUNTING_PAUSE 0x0D0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Fishing
-+ Catching Fish is primary objective ---*/
-+#define DIVIRTUAL_SPORTS_FISHING 0x0E000000
-+#define DIAXIS_FISHING_LATERAL 0x0E008201 /* sidestep left/right */
-+#define DIAXIS_FISHING_MOVE 0x0E010202 /* move forward/backwards */
-+#define DIBUTTON_FISHING_CAST 0x0E000401 /* Cast line */
-+#define DIBUTTON_FISHING_TYPE 0x0E000402 /* Select cast type */
-+#define DIBUTTON_FISHING_BINOCULAR 0x0E000403 /* Look through Binocular */
-+#define DIBUTTON_FISHING_BAIT 0x0E000404 /* Select type of Bait */
-+#define DIBUTTON_FISHING_MAP 0x0E000405 /* View Map */
-+#define DIBUTTON_FISHING_MENU 0x0E0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_FISHING_GLANCE 0x0E004601 /* Look around */
-+#define DIBUTTON_FISHING_DISPLAY 0x0E004406 /* Show next on-screen display option */
-+#define DIAXIS_FISHING_ROTATE 0x0E024203 /* Turn character left / right */
-+#define DIBUTTON_FISHING_CROUCH 0x0E004407 /* Crouch/ Climb / Swim down */
-+#define DIBUTTON_FISHING_JUMP 0x0E004408 /* Jump/ Climb up / Swim up */
-+#define DIBUTTON_FISHING_LEFT_LINK 0x0E00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_FISHING_RIGHT_LINK 0x0E00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_FISHING_FORWARD_LINK 0x0E0144E0 /* Fallback move forward button */
-+#define DIBUTTON_FISHING_BACK_LINK 0x0E0144E8 /* Fallback move back button */
-+#define DIBUTTON_FISHING_ROTATE_LEFT_LINK 0x0E0244E4 /* Fallback turn body left button */
-+#define DIBUTTON_FISHING_ROTATE_RIGHT_LINK 0x0E0244EC /* Fallback turn body right button */
-+#define DIBUTTON_FISHING_DEVICE 0x0E0044FE /* Show input device and controls */
-+#define DIBUTTON_FISHING_PAUSE 0x0E0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Baseball - Batting
-+ Batter control is primary objective ---*/
-+#define DIVIRTUAL_SPORTS_BASEBALL_BAT 0x0F000000
-+#define DIAXIS_BASEBALLB_LATERAL 0x0F008201 /* Aim left / right */
-+#define DIAXIS_BASEBALLB_MOVE 0x0F010202 /* Aim up / down */
-+#define DIBUTTON_BASEBALLB_SELECT 0x0F000401 /* cycle through swing options */
-+#define DIBUTTON_BASEBALLB_NORMAL 0x0F000402 /* normal swing */
-+#define DIBUTTON_BASEBALLB_POWER 0x0F000403 /* swing for the fence */
-+#define DIBUTTON_BASEBALLB_BUNT 0x0F000404 /* bunt */
-+#define DIBUTTON_BASEBALLB_STEAL 0x0F000405 /* Base runner attempts to steal a base */
-+#define DIBUTTON_BASEBALLB_BURST 0x0F000406 /* Base runner invokes burst of speed */
-+#define DIBUTTON_BASEBALLB_SLIDE 0x0F000407 /* Base runner slides into base */
-+#define DIBUTTON_BASEBALLB_CONTACT 0x0F000408 /* Contact swing */
-+#define DIBUTTON_BASEBALLB_MENU 0x0F0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_BASEBALLB_NOSTEAL 0x0F004409 /* Base runner goes back to a base */
-+#define DIBUTTON_BASEBALLB_BOX 0x0F00440A /* Enter or exit batting box */
-+#define DIBUTTON_BASEBALLB_LEFT_LINK 0x0F00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_BASEBALLB_RIGHT_LINK 0x0F00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_BASEBALLB_FORWARD_LINK 0x0F0144E0 /* Fallback move forward button */
-+#define DIBUTTON_BASEBALLB_BACK_LINK 0x0F0144E8 /* Fallback move back button */
-+#define DIBUTTON_BASEBALLB_DEVICE 0x0F0044FE /* Show input device and controls */
-+#define DIBUTTON_BASEBALLB_PAUSE 0x0F0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Baseball - Pitching
-+ Pitcher control is primary objective ---*/
-+#define DIVIRTUAL_SPORTS_BASEBALL_PITCH 0x10000000
-+#define DIAXIS_BASEBALLP_LATERAL 0x10008201 /* Aim left / right */
-+#define DIAXIS_BASEBALLP_MOVE 0x10010202 /* Aim up / down */
-+#define DIBUTTON_BASEBALLP_SELECT 0x10000401 /* cycle through pitch selections */
-+#define DIBUTTON_BASEBALLP_PITCH 0x10000402 /* throw pitch */
-+#define DIBUTTON_BASEBALLP_BASE 0x10000403 /* select base to throw to */
-+#define DIBUTTON_BASEBALLP_THROW 0x10000404 /* throw to base */
-+#define DIBUTTON_BASEBALLP_FAKE 0x10000405 /* Fake a throw to a base */
-+#define DIBUTTON_BASEBALLP_MENU 0x100004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_BASEBALLP_WALK 0x10004406 /* Throw intentional walk / pitch out */
-+#define DIBUTTON_BASEBALLP_LOOK 0x10004407 /* Look at runners on bases */
-+#define DIBUTTON_BASEBALLP_LEFT_LINK 0x1000C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_BASEBALLP_RIGHT_LINK 0x1000C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_BASEBALLP_FORWARD_LINK 0x100144E0 /* Fallback move forward button */
-+#define DIBUTTON_BASEBALLP_BACK_LINK 0x100144E8 /* Fallback move back button */
-+#define DIBUTTON_BASEBALLP_DEVICE 0x100044FE /* Show input device and controls */
-+#define DIBUTTON_BASEBALLP_PAUSE 0x100044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Baseball - Fielding
-+ Fielder control is primary objective ---*/
-+#define DIVIRTUAL_SPORTS_BASEBALL_FIELD 0x11000000
-+#define DIAXIS_BASEBALLF_LATERAL 0x11008201 /* Aim left / right */
-+#define DIAXIS_BASEBALLF_MOVE 0x11010202 /* Aim up / down */
-+#define DIBUTTON_BASEBALLF_NEAREST 0x11000401 /* Switch to fielder nearest to the ball */
-+#define DIBUTTON_BASEBALLF_THROW1 0x11000402 /* Make conservative throw */
-+#define DIBUTTON_BASEBALLF_THROW2 0x11000403 /* Make aggressive throw */
-+#define DIBUTTON_BASEBALLF_BURST 0x11000404 /* Invoke burst of speed */
-+#define DIBUTTON_BASEBALLF_JUMP 0x11000405 /* Jump to catch ball */
-+#define DIBUTTON_BASEBALLF_DIVE 0x11000406 /* Dive to catch ball */
-+#define DIBUTTON_BASEBALLF_MENU 0x110004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_BASEBALLF_SHIFTIN 0x11004407 /* Shift the infield positioning */
-+#define DIBUTTON_BASEBALLF_SHIFTOUT 0x11004408 /* Shift the outfield positioning */
-+#define DIBUTTON_BASEBALLF_AIM_LEFT_LINK 0x1100C4E4 /* Fallback aim left button */
-+#define DIBUTTON_BASEBALLF_AIM_RIGHT_LINK 0x1100C4EC /* Fallback aim right button */
-+#define DIBUTTON_BASEBALLF_FORWARD_LINK 0x110144E0 /* Fallback move forward button */
-+#define DIBUTTON_BASEBALLF_BACK_LINK 0x110144E8 /* Fallback move back button */
-+#define DIBUTTON_BASEBALLF_DEVICE 0x110044FE /* Show input device and controls */
-+#define DIBUTTON_BASEBALLF_PAUSE 0x110044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Basketball - Offense
-+ Offense ---*/
-+#define DIVIRTUAL_SPORTS_BASKETBALL_OFFENSE 0x12000000
-+#define DIAXIS_BBALLO_LATERAL 0x12008201 /* left / right */
-+#define DIAXIS_BBALLO_MOVE 0x12010202 /* up / down */
-+#define DIBUTTON_BBALLO_SHOOT 0x12000401 /* shoot basket */
-+#define DIBUTTON_BBALLO_DUNK 0x12000402 /* dunk basket */
-+#define DIBUTTON_BBALLO_PASS 0x12000403 /* throw pass */
-+#define DIBUTTON_BBALLO_FAKE 0x12000404 /* fake shot or pass */
-+#define DIBUTTON_BBALLO_SPECIAL 0x12000405 /* apply special move */
-+#define DIBUTTON_BBALLO_PLAYER 0x12000406 /* select next player */
-+#define DIBUTTON_BBALLO_BURST 0x12000407 /* invoke burst */
-+#define DIBUTTON_BBALLO_CALL 0x12000408 /* call for ball / pass to me */
-+#define DIBUTTON_BBALLO_MENU 0x120004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_BBALLO_GLANCE 0x12004601 /* scroll view */
-+#define DIBUTTON_BBALLO_SCREEN 0x12004409 /* Call for screen */
-+#define DIBUTTON_BBALLO_PLAY 0x1200440A /* Call for specific offensive play */
-+#define DIBUTTON_BBALLO_JAB 0x1200440B /* Initiate fake drive to basket */
-+#define DIBUTTON_BBALLO_POST 0x1200440C /* Perform post move */
-+#define DIBUTTON_BBALLO_TIMEOUT 0x1200440D /* Time Out */
-+#define DIBUTTON_BBALLO_SUBSTITUTE 0x1200440E /* substitute one player for another */
-+#define DIBUTTON_BBALLO_LEFT_LINK 0x1200C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_BBALLO_RIGHT_LINK 0x1200C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_BBALLO_FORWARD_LINK 0x120144E0 /* Fallback move forward button */
-+#define DIBUTTON_BBALLO_BACK_LINK 0x120144E8 /* Fallback move back button */
-+#define DIBUTTON_BBALLO_DEVICE 0x120044FE /* Show input device and controls */
-+#define DIBUTTON_BBALLO_PAUSE 0x120044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Basketball - Defense
-+ Defense ---*/
-+#define DIVIRTUAL_SPORTS_BASKETBALL_DEFENSE 0x13000000
-+#define DIAXIS_BBALLD_LATERAL 0x13008201 /* left / right */
-+#define DIAXIS_BBALLD_MOVE 0x13010202 /* up / down */
-+#define DIBUTTON_BBALLD_JUMP 0x13000401 /* jump to block shot */
-+#define DIBUTTON_BBALLD_STEAL 0x13000402 /* attempt to steal ball */
-+#define DIBUTTON_BBALLD_FAKE 0x13000403 /* fake block or steal */
-+#define DIBUTTON_BBALLD_SPECIAL 0x13000404 /* apply special move */
-+#define DIBUTTON_BBALLD_PLAYER 0x13000405 /* select next player */
-+#define DIBUTTON_BBALLD_BURST 0x13000406 /* invoke burst */
-+#define DIBUTTON_BBALLD_PLAY 0x13000407 /* call for specific defensive play */
-+#define DIBUTTON_BBALLD_MENU 0x130004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_BBALLD_GLANCE 0x13004601 /* scroll view */
-+#define DIBUTTON_BBALLD_TIMEOUT 0x13004408 /* Time Out */
-+#define DIBUTTON_BBALLD_SUBSTITUTE 0x13004409 /* substitute one player for another */
-+#define DIBUTTON_BBALLD_LEFT_LINK 0x1300C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_BBALLD_RIGHT_LINK 0x1300C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_BBALLD_FORWARD_LINK 0x130144E0 /* Fallback move forward button */
-+#define DIBUTTON_BBALLD_BACK_LINK 0x130144E8 /* Fallback move back button */
-+#define DIBUTTON_BBALLD_DEVICE 0x130044FE /* Show input device and controls */
-+#define DIBUTTON_BBALLD_PAUSE 0x130044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Football - Play
-+ Play selection ---*/
-+#define DIVIRTUAL_SPORTS_FOOTBALL_FIELD 0x14000000
-+#define DIBUTTON_FOOTBALLP_PLAY 0x14000401 /* cycle through available plays */
-+#define DIBUTTON_FOOTBALLP_SELECT 0x14000402 /* select play */
-+#define DIBUTTON_FOOTBALLP_HELP 0x14000403 /* Bring up pop-up help */
-+#define DIBUTTON_FOOTBALLP_MENU 0x140004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_FOOTBALLP_DEVICE 0x140044FE /* Show input device and controls */
-+#define DIBUTTON_FOOTBALLP_PAUSE 0x140044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Football - QB
-+ Offense: Quarterback / Kicker ---*/
-+#define DIVIRTUAL_SPORTS_FOOTBALL_QBCK 0x15000000
-+#define DIAXIS_FOOTBALLQ_LATERAL 0x15008201 /* Move / Aim: left / right */
-+#define DIAXIS_FOOTBALLQ_MOVE 0x15010202 /* Move / Aim: up / down */
-+#define DIBUTTON_FOOTBALLQ_SELECT 0x15000401 /* Select */
-+#define DIBUTTON_FOOTBALLQ_SNAP 0x15000402 /* snap ball - start play */
-+#define DIBUTTON_FOOTBALLQ_JUMP 0x15000403 /* jump over defender */
-+#define DIBUTTON_FOOTBALLQ_SLIDE 0x15000404 /* Dive/Slide */
-+#define DIBUTTON_FOOTBALLQ_PASS 0x15000405 /* throws pass to receiver */
-+#define DIBUTTON_FOOTBALLQ_FAKE 0x15000406 /* pump fake pass or fake kick */
-+#define DIBUTTON_FOOTBALLQ_MENU 0x150004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_FOOTBALLQ_FAKESNAP 0x15004407 /* Fake snap */
-+#define DIBUTTON_FOOTBALLQ_MOTION 0x15004408 /* Send receivers in motion */
-+#define DIBUTTON_FOOTBALLQ_AUDIBLE 0x15004409 /* Change offensive play at line of scrimmage */
-+#define DIBUTTON_FOOTBALLQ_LEFT_LINK 0x1500C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_FOOTBALLQ_RIGHT_LINK 0x1500C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_FOOTBALLQ_FORWARD_LINK 0x150144E0 /* Fallback move forward button */
-+#define DIBUTTON_FOOTBALLQ_BACK_LINK 0x150144E8 /* Fallback move back button */
-+#define DIBUTTON_FOOTBALLQ_DEVICE 0x150044FE /* Show input device and controls */
-+#define DIBUTTON_FOOTBALLQ_PAUSE 0x150044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Football - Offense
-+ Offense - Runner ---*/
-+#define DIVIRTUAL_SPORTS_FOOTBALL_OFFENSE 0x16000000
-+#define DIAXIS_FOOTBALLO_LATERAL 0x16008201 /* Move / Aim: left / right */
-+#define DIAXIS_FOOTBALLO_MOVE 0x16010202 /* Move / Aim: up / down */
-+#define DIBUTTON_FOOTBALLO_JUMP 0x16000401 /* jump or hurdle over defender */
-+#define DIBUTTON_FOOTBALLO_LEFTARM 0x16000402 /* holds out left arm */
-+#define DIBUTTON_FOOTBALLO_RIGHTARM 0x16000403 /* holds out right arm */
-+#define DIBUTTON_FOOTBALLO_THROW 0x16000404 /* throw pass or lateral ball to another runner */
-+#define DIBUTTON_FOOTBALLO_SPIN 0x16000405 /* Spin to avoid defenders */
-+#define DIBUTTON_FOOTBALLO_MENU 0x160004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_FOOTBALLO_JUKE 0x16004406 /* Use special move to avoid defenders */
-+#define DIBUTTON_FOOTBALLO_SHOULDER 0x16004407 /* Lower shoulder to run over defenders */
-+#define DIBUTTON_FOOTBALLO_TURBO 0x16004408 /* Speed burst past defenders */
-+#define DIBUTTON_FOOTBALLO_DIVE 0x16004409 /* Dive over defenders */
-+#define DIBUTTON_FOOTBALLO_ZOOM 0x1600440A /* Zoom view in / out */
-+#define DIBUTTON_FOOTBALLO_SUBSTITUTE 0x1600440B /* substitute one player for another */
-+#define DIBUTTON_FOOTBALLO_LEFT_LINK 0x1600C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_FOOTBALLO_RIGHT_LINK 0x1600C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_FOOTBALLO_FORWARD_LINK 0x160144E0 /* Fallback move forward button */
-+#define DIBUTTON_FOOTBALLO_BACK_LINK 0x160144E8 /* Fallback move back button */
-+#define DIBUTTON_FOOTBALLO_DEVICE 0x160044FE /* Show input device and controls */
-+#define DIBUTTON_FOOTBALLO_PAUSE 0x160044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Football - Defense
-+ Defense ---*/
-+#define DIVIRTUAL_SPORTS_FOOTBALL_DEFENSE 0x17000000
-+#define DIAXIS_FOOTBALLD_LATERAL 0x17008201 /* Move / Aim: left / right */
-+#define DIAXIS_FOOTBALLD_MOVE 0x17010202 /* Move / Aim: up / down */
-+#define DIBUTTON_FOOTBALLD_PLAY 0x17000401 /* cycle through available plays */
-+#define DIBUTTON_FOOTBALLD_SELECT 0x17000402 /* select player closest to the ball */
-+#define DIBUTTON_FOOTBALLD_JUMP 0x17000403 /* jump to intercept or block */
-+#define DIBUTTON_FOOTBALLD_TACKLE 0x17000404 /* tackler runner */
-+#define DIBUTTON_FOOTBALLD_FAKE 0x17000405 /* hold down to fake tackle or intercept */
-+#define DIBUTTON_FOOTBALLD_SUPERTACKLE 0x17000406 /* Initiate special tackle */
-+#define DIBUTTON_FOOTBALLD_MENU 0x170004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_FOOTBALLD_SPIN 0x17004407 /* Spin to beat offensive line */
-+#define DIBUTTON_FOOTBALLD_SWIM 0x17004408 /* Swim to beat the offensive line */
-+#define DIBUTTON_FOOTBALLD_BULLRUSH 0x17004409 /* Bull rush the offensive line */
-+#define DIBUTTON_FOOTBALLD_RIP 0x1700440A /* Rip the offensive line */
-+#define DIBUTTON_FOOTBALLD_AUDIBLE 0x1700440B /* Change defensive play at the line of scrimmage */
-+#define DIBUTTON_FOOTBALLD_ZOOM 0x1700440C /* Zoom view in / out */
-+#define DIBUTTON_FOOTBALLD_SUBSTITUTE 0x1700440D /* substitute one player for another */
-+#define DIBUTTON_FOOTBALLD_LEFT_LINK 0x1700C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_FOOTBALLD_RIGHT_LINK 0x1700C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_FOOTBALLD_FORWARD_LINK 0x170144E0 /* Fallback move forward button */
-+#define DIBUTTON_FOOTBALLD_BACK_LINK 0x170144E8 /* Fallback move back button */
-+#define DIBUTTON_FOOTBALLD_DEVICE 0x170044FE /* Show input device and controls */
-+#define DIBUTTON_FOOTBALLD_PAUSE 0x170044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Golf
-+ ---*/
-+#define DIVIRTUAL_SPORTS_GOLF 0x18000000
-+#define DIAXIS_GOLF_LATERAL 0x18008201 /* Move / Aim: left / right */
-+#define DIAXIS_GOLF_MOVE 0x18010202 /* Move / Aim: up / down */
-+#define DIBUTTON_GOLF_SWING 0x18000401 /* swing club */
-+#define DIBUTTON_GOLF_SELECT 0x18000402 /* cycle between: club / swing strength / ball arc / ball spin */
-+#define DIBUTTON_GOLF_UP 0x18000403 /* increase selection */
-+#define DIBUTTON_GOLF_DOWN 0x18000404 /* decrease selection */
-+#define DIBUTTON_GOLF_TERRAIN 0x18000405 /* shows terrain detail */
-+#define DIBUTTON_GOLF_FLYBY 0x18000406 /* view the hole via a flyby */
-+#define DIBUTTON_GOLF_MENU 0x180004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_GOLF_SCROLL 0x18004601 /* scroll view */
-+#define DIBUTTON_GOLF_ZOOM 0x18004407 /* Zoom view in / out */
-+#define DIBUTTON_GOLF_TIMEOUT 0x18004408 /* Call for time out */
-+#define DIBUTTON_GOLF_SUBSTITUTE 0x18004409 /* substitute one player for another */
-+#define DIBUTTON_GOLF_LEFT_LINK 0x1800C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_GOLF_RIGHT_LINK 0x1800C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_GOLF_FORWARD_LINK 0x180144E0 /* Fallback move forward button */
-+#define DIBUTTON_GOLF_BACK_LINK 0x180144E8 /* Fallback move back button */
-+#define DIBUTTON_GOLF_DEVICE 0x180044FE /* Show input device and controls */
-+#define DIBUTTON_GOLF_PAUSE 0x180044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Hockey - Offense
-+ Offense ---*/
-+#define DIVIRTUAL_SPORTS_HOCKEY_OFFENSE 0x19000000
-+#define DIAXIS_HOCKEYO_LATERAL 0x19008201 /* Move / Aim: left / right */
-+#define DIAXIS_HOCKEYO_MOVE 0x19010202 /* Move / Aim: up / down */
-+#define DIBUTTON_HOCKEYO_SHOOT 0x19000401 /* Shoot */
-+#define DIBUTTON_HOCKEYO_PASS 0x19000402 /* pass the puck */
-+#define DIBUTTON_HOCKEYO_BURST 0x19000403 /* invoke speed burst */
-+#define DIBUTTON_HOCKEYO_SPECIAL 0x19000404 /* invoke special move */
-+#define DIBUTTON_HOCKEYO_FAKE 0x19000405 /* hold down to fake pass or kick */
-+#define DIBUTTON_HOCKEYO_MENU 0x190004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_HOCKEYO_SCROLL 0x19004601 /* scroll view */
-+#define DIBUTTON_HOCKEYO_ZOOM 0x19004406 /* Zoom view in / out */
-+#define DIBUTTON_HOCKEYO_STRATEGY 0x19004407 /* Invoke coaching menu for strategy help */
-+#define DIBUTTON_HOCKEYO_TIMEOUT 0x19004408 /* Call for time out */
-+#define DIBUTTON_HOCKEYO_SUBSTITUTE 0x19004409 /* substitute one player for another */
-+#define DIBUTTON_HOCKEYO_LEFT_LINK 0x1900C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_HOCKEYO_RIGHT_LINK 0x1900C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_HOCKEYO_FORWARD_LINK 0x190144E0 /* Fallback move forward button */
-+#define DIBUTTON_HOCKEYO_BACK_LINK 0x190144E8 /* Fallback move back button */
-+#define DIBUTTON_HOCKEYO_DEVICE 0x190044FE /* Show input device and controls */
-+#define DIBUTTON_HOCKEYO_PAUSE 0x190044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Hockey - Defense
-+ Defense ---*/
-+#define DIVIRTUAL_SPORTS_HOCKEY_DEFENSE 0x1A000000
-+#define DIAXIS_HOCKEYD_LATERAL 0x1A008201 /* Move / Aim: left / right */
-+#define DIAXIS_HOCKEYD_MOVE 0x1A010202 /* Move / Aim: up / down */
-+#define DIBUTTON_HOCKEYD_PLAYER 0x1A000401 /* control player closest to the puck */
-+#define DIBUTTON_HOCKEYD_STEAL 0x1A000402 /* attempt steal */
-+#define DIBUTTON_HOCKEYD_BURST 0x1A000403 /* speed burst or body check */
-+#define DIBUTTON_HOCKEYD_BLOCK 0x1A000404 /* block puck */
-+#define DIBUTTON_HOCKEYD_FAKE 0x1A000405 /* hold down to fake tackle or intercept */
-+#define DIBUTTON_HOCKEYD_MENU 0x1A0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_HOCKEYD_SCROLL 0x1A004601 /* scroll view */
-+#define DIBUTTON_HOCKEYD_ZOOM 0x1A004406 /* Zoom view in / out */
-+#define DIBUTTON_HOCKEYD_STRATEGY 0x1A004407 /* Invoke coaching menu for strategy help */
-+#define DIBUTTON_HOCKEYD_TIMEOUT 0x1A004408 /* Call for time out */
-+#define DIBUTTON_HOCKEYD_SUBSTITUTE 0x1A004409 /* substitute one player for another */
-+#define DIBUTTON_HOCKEYD_LEFT_LINK 0x1A00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_HOCKEYD_RIGHT_LINK 0x1A00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_HOCKEYD_FORWARD_LINK 0x1A0144E0 /* Fallback move forward button */
-+#define DIBUTTON_HOCKEYD_BACK_LINK 0x1A0144E8 /* Fallback move back button */
-+#define DIBUTTON_HOCKEYD_DEVICE 0x1A0044FE /* Show input device and controls */
-+#define DIBUTTON_HOCKEYD_PAUSE 0x1A0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Hockey - Goalie
-+ Goal tending ---*/
-+#define DIVIRTUAL_SPORTS_HOCKEY_GOALIE 0x1B000000
-+#define DIAXIS_HOCKEYG_LATERAL 0x1B008201 /* Move / Aim: left / right */
-+#define DIAXIS_HOCKEYG_MOVE 0x1B010202 /* Move / Aim: up / down */
-+#define DIBUTTON_HOCKEYG_PASS 0x1B000401 /* pass puck */
-+#define DIBUTTON_HOCKEYG_POKE 0x1B000402 /* poke / check / hack */
-+#define DIBUTTON_HOCKEYG_STEAL 0x1B000403 /* attempt steal */
-+#define DIBUTTON_HOCKEYG_BLOCK 0x1B000404 /* block puck */
-+#define DIBUTTON_HOCKEYG_MENU 0x1B0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_HOCKEYG_SCROLL 0x1B004601 /* scroll view */
-+#define DIBUTTON_HOCKEYG_ZOOM 0x1B004405 /* Zoom view in / out */
-+#define DIBUTTON_HOCKEYG_STRATEGY 0x1B004406 /* Invoke coaching menu for strategy help */
-+#define DIBUTTON_HOCKEYG_TIMEOUT 0x1B004407 /* Call for time out */
-+#define DIBUTTON_HOCKEYG_SUBSTITUTE 0x1B004408 /* substitute one player for another */
-+#define DIBUTTON_HOCKEYG_LEFT_LINK 0x1B00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_HOCKEYG_RIGHT_LINK 0x1B00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_HOCKEYG_FORWARD_LINK 0x1B0144E0 /* Fallback move forward button */
-+#define DIBUTTON_HOCKEYG_BACK_LINK 0x1B0144E8 /* Fallback move back button */
-+#define DIBUTTON_HOCKEYG_DEVICE 0x1B0044FE /* Show input device and controls */
-+#define DIBUTTON_HOCKEYG_PAUSE 0x1B0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Mountain Biking
-+ ---*/
-+#define DIVIRTUAL_SPORTS_BIKING_MOUNTAIN 0x1C000000
-+#define DIAXIS_BIKINGM_TURN 0x1C008201 /* left / right */
-+#define DIAXIS_BIKINGM_PEDAL 0x1C010202 /* Pedal faster / slower / brake */
-+#define DIBUTTON_BIKINGM_JUMP 0x1C000401 /* jump over obstacle */
-+#define DIBUTTON_BIKINGM_CAMERA 0x1C000402 /* switch camera view */
-+#define DIBUTTON_BIKINGM_SPECIAL1 0x1C000403 /* perform first special move */
-+#define DIBUTTON_BIKINGM_SELECT 0x1C000404 /* Select */
-+#define DIBUTTON_BIKINGM_SPECIAL2 0x1C000405 /* perform second special move */
-+#define DIBUTTON_BIKINGM_MENU 0x1C0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_BIKINGM_SCROLL 0x1C004601 /* scroll view */
-+#define DIBUTTON_BIKINGM_ZOOM 0x1C004406 /* Zoom view in / out */
-+#define DIAXIS_BIKINGM_BRAKE 0x1C044203 /* Brake axis */
-+#define DIBUTTON_BIKINGM_LEFT_LINK 0x1C00C4E4 /* Fallback turn left button */
-+#define DIBUTTON_BIKINGM_RIGHT_LINK 0x1C00C4EC /* Fallback turn right button */
-+#define DIBUTTON_BIKINGM_FASTER_LINK 0x1C0144E0 /* Fallback pedal faster button */
-+#define DIBUTTON_BIKINGM_SLOWER_LINK 0x1C0144E8 /* Fallback pedal slower button */
-+#define DIBUTTON_BIKINGM_BRAKE_BUTTON_LINK 0x1C0444E8 /* Fallback brake button */
-+#define DIBUTTON_BIKINGM_DEVICE 0x1C0044FE /* Show input device and controls */
-+#define DIBUTTON_BIKINGM_PAUSE 0x1C0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports: Skiing / Snowboarding / Skateboarding
-+ ---*/
-+#define DIVIRTUAL_SPORTS_SKIING 0x1D000000
-+#define DIAXIS_SKIING_TURN 0x1D008201 /* left / right */
-+#define DIAXIS_SKIING_SPEED 0x1D010202 /* faster / slower */
-+#define DIBUTTON_SKIING_JUMP 0x1D000401 /* Jump */
-+#define DIBUTTON_SKIING_CROUCH 0x1D000402 /* crouch down */
-+#define DIBUTTON_SKIING_CAMERA 0x1D000403 /* switch camera view */
-+#define DIBUTTON_SKIING_SPECIAL1 0x1D000404 /* perform first special move */
-+#define DIBUTTON_SKIING_SELECT 0x1D000405 /* Select */
-+#define DIBUTTON_SKIING_SPECIAL2 0x1D000406 /* perform second special move */
-+#define DIBUTTON_SKIING_MENU 0x1D0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_SKIING_GLANCE 0x1D004601 /* scroll view */
-+#define DIBUTTON_SKIING_ZOOM 0x1D004407 /* Zoom view in / out */
-+#define DIBUTTON_SKIING_LEFT_LINK 0x1D00C4E4 /* Fallback turn left button */
-+#define DIBUTTON_SKIING_RIGHT_LINK 0x1D00C4EC /* Fallback turn right button */
-+#define DIBUTTON_SKIING_FASTER_LINK 0x1D0144E0 /* Fallback increase speed button */
-+#define DIBUTTON_SKIING_SLOWER_LINK 0x1D0144E8 /* Fallback decrease speed button */
-+#define DIBUTTON_SKIING_DEVICE 0x1D0044FE /* Show input device and controls */
-+#define DIBUTTON_SKIING_PAUSE 0x1D0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Soccer - Offense
-+ Offense ---*/
-+#define DIVIRTUAL_SPORTS_SOCCER_OFFENSE 0x1E000000
-+#define DIAXIS_SOCCERO_LATERAL 0x1E008201 /* Move / Aim: left / right */
-+#define DIAXIS_SOCCERO_MOVE 0x1E010202 /* Move / Aim: up / down */
-+#define DIAXIS_SOCCERO_BEND 0x1E018203 /* Bend to soccer shot/pass */
-+#define DIBUTTON_SOCCERO_SHOOT 0x1E000401 /* Shoot the ball */
-+#define DIBUTTON_SOCCERO_PASS 0x1E000402 /* Pass */
-+#define DIBUTTON_SOCCERO_FAKE 0x1E000403 /* Fake */
-+#define DIBUTTON_SOCCERO_PLAYER 0x1E000404 /* Select next player */
-+#define DIBUTTON_SOCCERO_SPECIAL1 0x1E000405 /* Apply special move */
-+#define DIBUTTON_SOCCERO_SELECT 0x1E000406 /* Select special move */
-+#define DIBUTTON_SOCCERO_MENU 0x1E0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_SOCCERO_GLANCE 0x1E004601 /* scroll view */
-+#define DIBUTTON_SOCCERO_SUBSTITUTE 0x1E004407 /* Substitute one player for another */
-+#define DIBUTTON_SOCCERO_SHOOTLOW 0x1E004408 /* Shoot the ball low */
-+#define DIBUTTON_SOCCERO_SHOOTHIGH 0x1E004409 /* Shoot the ball high */
-+#define DIBUTTON_SOCCERO_PASSTHRU 0x1E00440A /* Make a thru pass */
-+#define DIBUTTON_SOCCERO_SPRINT 0x1E00440B /* Sprint / turbo boost */
-+#define DIBUTTON_SOCCERO_CONTROL 0x1E00440C /* Obtain control of the ball */
-+#define DIBUTTON_SOCCERO_HEAD 0x1E00440D /* Attempt to head the ball */
-+#define DIBUTTON_SOCCERO_LEFT_LINK 0x1E00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_SOCCERO_RIGHT_LINK 0x1E00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_SOCCERO_FORWARD_LINK 0x1E0144E0 /* Fallback move forward button */
-+#define DIBUTTON_SOCCERO_BACK_LINK 0x1E0144E8 /* Fallback move back button */
-+#define DIBUTTON_SOCCERO_DEVICE 0x1E0044FE /* Show input device and controls */
-+#define DIBUTTON_SOCCERO_PAUSE 0x1E0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Soccer - Defense
-+ Defense ---*/
-+#define DIVIRTUAL_SPORTS_SOCCER_DEFENSE 0x1F000000
-+#define DIAXIS_SOCCERD_LATERAL 0x1F008201 /* Move / Aim: left / right */
-+#define DIAXIS_SOCCERD_MOVE 0x1F010202 /* Move / Aim: up / down */
-+#define DIBUTTON_SOCCERD_BLOCK 0x1F000401 /* Attempt to block shot */
-+#define DIBUTTON_SOCCERD_STEAL 0x1F000402 /* Attempt to steal ball */
-+#define DIBUTTON_SOCCERD_FAKE 0x1F000403 /* Fake a block or a steal */
-+#define DIBUTTON_SOCCERD_PLAYER 0x1F000404 /* Select next player */
-+#define DIBUTTON_SOCCERD_SPECIAL 0x1F000405 /* Apply special move */
-+#define DIBUTTON_SOCCERD_SELECT 0x1F000406 /* Select special move */
-+#define DIBUTTON_SOCCERD_SLIDE 0x1F000407 /* Attempt a slide tackle */
-+#define DIBUTTON_SOCCERD_MENU 0x1F0004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_SOCCERD_GLANCE 0x1F004601 /* scroll view */
-+#define DIBUTTON_SOCCERD_FOUL 0x1F004408 /* Initiate a foul / hard-foul */
-+#define DIBUTTON_SOCCERD_HEAD 0x1F004409 /* Attempt a Header */
-+#define DIBUTTON_SOCCERD_CLEAR 0x1F00440A /* Attempt to clear the ball down the field */
-+#define DIBUTTON_SOCCERD_GOALIECHARGE 0x1F00440B /* Make the goalie charge out of the box */
-+#define DIBUTTON_SOCCERD_SUBSTITUTE 0x1F00440C /* Substitute one player for another */
-+#define DIBUTTON_SOCCERD_LEFT_LINK 0x1F00C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_SOCCERD_RIGHT_LINK 0x1F00C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_SOCCERD_FORWARD_LINK 0x1F0144E0 /* Fallback move forward button */
-+#define DIBUTTON_SOCCERD_BACK_LINK 0x1F0144E8 /* Fallback move back button */
-+#define DIBUTTON_SOCCERD_DEVICE 0x1F0044FE /* Show input device and controls */
-+#define DIBUTTON_SOCCERD_PAUSE 0x1F0044FC /* Start / Pause / Restart game */
-+
-+/*--- Sports - Racquet
-+ Tennis - Table-Tennis - Squash ---*/
-+#define DIVIRTUAL_SPORTS_RACQUET 0x20000000
-+#define DIAXIS_RACQUET_LATERAL 0x20008201 /* Move / Aim: left / right */
-+#define DIAXIS_RACQUET_MOVE 0x20010202 /* Move / Aim: up / down */
-+#define DIBUTTON_RACQUET_SWING 0x20000401 /* Swing racquet */
-+#define DIBUTTON_RACQUET_BACKSWING 0x20000402 /* Swing backhand */
-+#define DIBUTTON_RACQUET_SMASH 0x20000403 /* Smash shot */
-+#define DIBUTTON_RACQUET_SPECIAL 0x20000404 /* Special shot */
-+#define DIBUTTON_RACQUET_SELECT 0x20000405 /* Select special shot */
-+#define DIBUTTON_RACQUET_MENU 0x200004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_RACQUET_GLANCE 0x20004601 /* scroll view */
-+#define DIBUTTON_RACQUET_TIMEOUT 0x20004406 /* Call for time out */
-+#define DIBUTTON_RACQUET_SUBSTITUTE 0x20004407 /* Substitute one player for another */
-+#define DIBUTTON_RACQUET_LEFT_LINK 0x2000C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_RACQUET_RIGHT_LINK 0x2000C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_RACQUET_FORWARD_LINK 0x200144E0 /* Fallback move forward button */
-+#define DIBUTTON_RACQUET_BACK_LINK 0x200144E8 /* Fallback move back button */
-+#define DIBUTTON_RACQUET_DEVICE 0x200044FE /* Show input device and controls */
-+#define DIBUTTON_RACQUET_PAUSE 0x200044FC /* Start / Pause / Restart game */
-+
-+/*--- Arcade- 2D
-+ Side to Side movement ---*/
-+#define DIVIRTUAL_ARCADE_SIDE2SIDE 0x21000000
-+#define DIAXIS_ARCADES_LATERAL 0x21008201 /* left / right */
-+#define DIAXIS_ARCADES_MOVE 0x21010202 /* up / down */
-+#define DIBUTTON_ARCADES_THROW 0x21000401 /* throw object */
-+#define DIBUTTON_ARCADES_CARRY 0x21000402 /* carry object */
-+#define DIBUTTON_ARCADES_ATTACK 0x21000403 /* attack */
-+#define DIBUTTON_ARCADES_SPECIAL 0x21000404 /* apply special move */
-+#define DIBUTTON_ARCADES_SELECT 0x21000405 /* select special move */
-+#define DIBUTTON_ARCADES_MENU 0x210004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_ARCADES_VIEW 0x21004601 /* scroll view left / right / up / down */
-+#define DIBUTTON_ARCADES_LEFT_LINK 0x2100C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_ARCADES_RIGHT_LINK 0x2100C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_ARCADES_FORWARD_LINK 0x210144E0 /* Fallback move forward button */
-+#define DIBUTTON_ARCADES_BACK_LINK 0x210144E8 /* Fallback move back button */
-+#define DIBUTTON_ARCADES_VIEW_UP_LINK 0x2107C4E0 /* Fallback scroll view up button */
-+#define DIBUTTON_ARCADES_VIEW_DOWN_LINK 0x2107C4E8 /* Fallback scroll view down button */
-+#define DIBUTTON_ARCADES_VIEW_LEFT_LINK 0x2107C4E4 /* Fallback scroll view left button */
-+#define DIBUTTON_ARCADES_VIEW_RIGHT_LINK 0x2107C4EC /* Fallback scroll view right button */
-+#define DIBUTTON_ARCADES_DEVICE 0x210044FE /* Show input device and controls */
-+#define DIBUTTON_ARCADES_PAUSE 0x210044FC /* Start / Pause / Restart game */
-+
-+/*--- Arcade - Platform Game
-+ Character moves around on screen ---*/
-+#define DIVIRTUAL_ARCADE_PLATFORM 0x22000000
-+#define DIAXIS_ARCADEP_LATERAL 0x22008201 /* Left / right */
-+#define DIAXIS_ARCADEP_MOVE 0x22010202 /* Up / down */
-+#define DIBUTTON_ARCADEP_JUMP 0x22000401 /* Jump */
-+#define DIBUTTON_ARCADEP_FIRE 0x22000402 /* Fire */
-+#define DIBUTTON_ARCADEP_CROUCH 0x22000403 /* Crouch */
-+#define DIBUTTON_ARCADEP_SPECIAL 0x22000404 /* Apply special move */
-+#define DIBUTTON_ARCADEP_SELECT 0x22000405 /* Select special move */
-+#define DIBUTTON_ARCADEP_MENU 0x220004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_ARCADEP_VIEW 0x22004601 /* Scroll view */
-+#define DIBUTTON_ARCADEP_FIRESECONDARY 0x22004406 /* Alternative fire button */
-+#define DIBUTTON_ARCADEP_LEFT_LINK 0x2200C4E4 /* Fallback sidestep left button */
-+#define DIBUTTON_ARCADEP_RIGHT_LINK 0x2200C4EC /* Fallback sidestep right button */
-+#define DIBUTTON_ARCADEP_FORWARD_LINK 0x220144E0 /* Fallback move forward button */
-+#define DIBUTTON_ARCADEP_BACK_LINK 0x220144E8 /* Fallback move back button */
-+#define DIBUTTON_ARCADEP_VIEW_UP_LINK 0x2207C4E0 /* Fallback scroll view up button */
-+#define DIBUTTON_ARCADEP_VIEW_DOWN_LINK 0x2207C4E8 /* Fallback scroll view down button */
-+#define DIBUTTON_ARCADEP_VIEW_LEFT_LINK 0x2207C4E4 /* Fallback scroll view left button */
-+#define DIBUTTON_ARCADEP_VIEW_RIGHT_LINK 0x2207C4EC /* Fallback scroll view right button */
-+#define DIBUTTON_ARCADEP_DEVICE 0x220044FE /* Show input device and controls */
-+#define DIBUTTON_ARCADEP_PAUSE 0x220044FC /* Start / Pause / Restart game */
-+
-+/*--- CAD - 2D Object Control
-+ Controls to select and move objects in 2D ---*/
-+#define DIVIRTUAL_CAD_2DCONTROL 0x23000000
-+#define DIAXIS_2DCONTROL_LATERAL 0x23008201 /* Move view left / right */
-+#define DIAXIS_2DCONTROL_MOVE 0x23010202 /* Move view up / down */
-+#define DIAXIS_2DCONTROL_INOUT 0x23018203 /* Zoom - in / out */
-+#define DIBUTTON_2DCONTROL_SELECT 0x23000401 /* Select Object */
-+#define DIBUTTON_2DCONTROL_SPECIAL1 0x23000402 /* Do first special operation */
-+#define DIBUTTON_2DCONTROL_SPECIAL 0x23000403 /* Select special operation */
-+#define DIBUTTON_2DCONTROL_SPECIAL2 0x23000404 /* Do second special operation */
-+#define DIBUTTON_2DCONTROL_MENU 0x230004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_2DCONTROL_HATSWITCH 0x23004601 /* Hat switch */
-+#define DIAXIS_2DCONTROL_ROTATEZ 0x23024204 /* Rotate view clockwise / counterclockwise */
-+#define DIBUTTON_2DCONTROL_DISPLAY 0x23004405 /* Shows next on-screen display options */
-+#define DIBUTTON_2DCONTROL_DEVICE 0x230044FE /* Show input device and controls */
-+#define DIBUTTON_2DCONTROL_PAUSE 0x230044FC /* Start / Pause / Restart game */
-+
-+/*--- CAD - 3D object control
-+ Controls to select and move objects within a 3D environment ---*/
-+#define DIVIRTUAL_CAD_3DCONTROL 0x24000000
-+#define DIAXIS_3DCONTROL_LATERAL 0x24008201 /* Move view left / right */
-+#define DIAXIS_3DCONTROL_MOVE 0x24010202 /* Move view up / down */
-+#define DIAXIS_3DCONTROL_INOUT 0x24018203 /* Zoom - in / out */
-+#define DIBUTTON_3DCONTROL_SELECT 0x24000401 /* Select Object */
-+#define DIBUTTON_3DCONTROL_SPECIAL1 0x24000402 /* Do first special operation */
-+#define DIBUTTON_3DCONTROL_SPECIAL 0x24000403 /* Select special operation */
-+#define DIBUTTON_3DCONTROL_SPECIAL2 0x24000404 /* Do second special operation */
-+#define DIBUTTON_3DCONTROL_MENU 0x240004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_3DCONTROL_HATSWITCH 0x24004601 /* Hat switch */
-+#define DIAXIS_3DCONTROL_ROTATEX 0x24034204 /* Rotate view forward or up / backward or down */
-+#define DIAXIS_3DCONTROL_ROTATEY 0x2402C205 /* Rotate view clockwise / counterclockwise */
-+#define DIAXIS_3DCONTROL_ROTATEZ 0x24024206 /* Rotate view left / right */
-+#define DIBUTTON_3DCONTROL_DISPLAY 0x24004405 /* Show next on-screen display options */
-+#define DIBUTTON_3DCONTROL_DEVICE 0x240044FE /* Show input device and controls */
-+#define DIBUTTON_3DCONTROL_PAUSE 0x240044FC /* Start / Pause / Restart game */
-+
-+/*--- CAD - 3D Navigation - Fly through
-+ Controls for 3D modeling ---*/
-+#define DIVIRTUAL_CAD_FLYBY 0x25000000
-+#define DIAXIS_CADF_LATERAL 0x25008201 /* move view left / right */
-+#define DIAXIS_CADF_MOVE 0x25010202 /* move view up / down */
-+#define DIAXIS_CADF_INOUT 0x25018203 /* in / out */
-+#define DIBUTTON_CADF_SELECT 0x25000401 /* Select Object */
-+#define DIBUTTON_CADF_SPECIAL1 0x25000402 /* do first special operation */
-+#define DIBUTTON_CADF_SPECIAL 0x25000403 /* Select special operation */
-+#define DIBUTTON_CADF_SPECIAL2 0x25000404 /* do second special operation */
-+#define DIBUTTON_CADF_MENU 0x250004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_CADF_HATSWITCH 0x25004601 /* Hat switch */
-+#define DIAXIS_CADF_ROTATEX 0x25034204 /* Rotate view forward or up / backward or down */
-+#define DIAXIS_CADF_ROTATEY 0x2502C205 /* Rotate view clockwise / counterclockwise */
-+#define DIAXIS_CADF_ROTATEZ 0x25024206 /* Rotate view left / right */
-+#define DIBUTTON_CADF_DISPLAY 0x25004405 /* shows next on-screen display options */
-+#define DIBUTTON_CADF_DEVICE 0x250044FE /* Show input device and controls */
-+#define DIBUTTON_CADF_PAUSE 0x250044FC /* Start / Pause / Restart game */
-+
-+/*--- CAD - 3D Model Control
-+ Controls for 3D modeling ---*/
-+#define DIVIRTUAL_CAD_MODEL 0x26000000
-+#define DIAXIS_CADM_LATERAL 0x26008201 /* move view left / right */
-+#define DIAXIS_CADM_MOVE 0x26010202 /* move view up / down */
-+#define DIAXIS_CADM_INOUT 0x26018203 /* in / out */
-+#define DIBUTTON_CADM_SELECT 0x26000401 /* Select Object */
-+#define DIBUTTON_CADM_SPECIAL1 0x26000402 /* do first special operation */
-+#define DIBUTTON_CADM_SPECIAL 0x26000403 /* Select special operation */
-+#define DIBUTTON_CADM_SPECIAL2 0x26000404 /* do second special operation */
-+#define DIBUTTON_CADM_MENU 0x260004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIHATSWITCH_CADM_HATSWITCH 0x26004601 /* Hat switch */
-+#define DIAXIS_CADM_ROTATEX 0x26034204 /* Rotate view forward or up / backward or down */
-+#define DIAXIS_CADM_ROTATEY 0x2602C205 /* Rotate view clockwise / counterclockwise */
-+#define DIAXIS_CADM_ROTATEZ 0x26024206 /* Rotate view left / right */
-+#define DIBUTTON_CADM_DISPLAY 0x26004405 /* shows next on-screen display options */
-+#define DIBUTTON_CADM_DEVICE 0x260044FE /* Show input device and controls */
-+#define DIBUTTON_CADM_PAUSE 0x260044FC /* Start / Pause / Restart game */
-+
-+/*--- Control - Media Equipment
-+ Remote ---*/
-+#define DIVIRTUAL_REMOTE_CONTROL 0x27000000
-+#define DIAXIS_REMOTE_SLIDER 0x27050201 /* Slider for adjustment: volume / color / bass / etc */
-+#define DIBUTTON_REMOTE_MUTE 0x27000401 /* Set volume on current device to zero */
-+#define DIBUTTON_REMOTE_SELECT 0x27000402 /* Next/previous: channel/ track / chapter / picture / station */
-+#define DIBUTTON_REMOTE_PLAY 0x27002403 /* Start or pause entertainment on current device */
-+#define DIBUTTON_REMOTE_CUE 0x27002404 /* Move through current media */
-+#define DIBUTTON_REMOTE_REVIEW 0x27002405 /* Move through current media */
-+#define DIBUTTON_REMOTE_CHANGE 0x27002406 /* Select next device */
-+#define DIBUTTON_REMOTE_RECORD 0x27002407 /* Start recording the current media */
-+#define DIBUTTON_REMOTE_MENU 0x270004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIAXIS_REMOTE_SLIDER2 0x27054202 /* Slider for adjustment: volume */
-+#define DIBUTTON_REMOTE_TV 0x27005C08 /* Select TV */
-+#define DIBUTTON_REMOTE_CABLE 0x27005C09 /* Select cable box */
-+#define DIBUTTON_REMOTE_CD 0x27005C0A /* Select CD player */
-+#define DIBUTTON_REMOTE_VCR 0x27005C0B /* Select VCR */
-+#define DIBUTTON_REMOTE_TUNER 0x27005C0C /* Select tuner */
-+#define DIBUTTON_REMOTE_DVD 0x27005C0D /* Select DVD player */
-+#define DIBUTTON_REMOTE_ADJUST 0x27005C0E /* Enter device adjustment menu */
-+#define DIBUTTON_REMOTE_DIGIT0 0x2700540F /* Digit 0 */
-+#define DIBUTTON_REMOTE_DIGIT1 0x27005410 /* Digit 1 */
-+#define DIBUTTON_REMOTE_DIGIT2 0x27005411 /* Digit 2 */
-+#define DIBUTTON_REMOTE_DIGIT3 0x27005412 /* Digit 3 */
-+#define DIBUTTON_REMOTE_DIGIT4 0x27005413 /* Digit 4 */
-+#define DIBUTTON_REMOTE_DIGIT5 0x27005414 /* Digit 5 */
-+#define DIBUTTON_REMOTE_DIGIT6 0x27005415 /* Digit 6 */
-+#define DIBUTTON_REMOTE_DIGIT7 0x27005416 /* Digit 7 */
-+#define DIBUTTON_REMOTE_DIGIT8 0x27005417 /* Digit 8 */
-+#define DIBUTTON_REMOTE_DIGIT9 0x27005418 /* Digit 9 */
-+#define DIBUTTON_REMOTE_DEVICE 0x270044FE /* Show input device and controls */
-+#define DIBUTTON_REMOTE_PAUSE 0x270044FC /* Start / Pause / Restart game */
-+
-+/*--- Control- Web
-+ Help or Browser ---*/
-+#define DIVIRTUAL_BROWSER_CONTROL 0x28000000
-+#define DIAXIS_BROWSER_LATERAL 0x28008201 /* Move on screen pointer */
-+#define DIAXIS_BROWSER_MOVE 0x28010202 /* Move on screen pointer */
-+#define DIBUTTON_BROWSER_SELECT 0x28000401 /* Select current item */
-+#define DIAXIS_BROWSER_VIEW 0x28018203 /* Move view up/down */
-+#define DIBUTTON_BROWSER_REFRESH 0x28000402 /* Refresh */
-+#define DIBUTTON_BROWSER_MENU 0x280004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_BROWSER_SEARCH 0x28004403 /* Use search tool */
-+#define DIBUTTON_BROWSER_STOP 0x28004404 /* Cease current update */
-+#define DIBUTTON_BROWSER_HOME 0x28004405 /* Go directly to "home" location */
-+#define DIBUTTON_BROWSER_FAVORITES 0x28004406 /* Mark current site as favorite */
-+#define DIBUTTON_BROWSER_NEXT 0x28004407 /* Select Next page */
-+#define DIBUTTON_BROWSER_PREVIOUS 0x28004408 /* Select Previous page */
-+#define DIBUTTON_BROWSER_HISTORY 0x28004409 /* Show/Hide History */
-+#define DIBUTTON_BROWSER_PRINT 0x2800440A /* Print current page */
-+#define DIBUTTON_BROWSER_DEVICE 0x280044FE /* Show input device and controls */
-+#define DIBUTTON_BROWSER_PAUSE 0x280044FC /* Start / Pause / Restart game */
-+
-+/*--- Driving Simulator - Giant Walking Robot
-+ Walking tank with weapons ---*/
-+#define DIVIRTUAL_DRIVING_MECHA 0x29000000
-+#define DIAXIS_MECHA_STEER 0x29008201 /* Turns mecha left/right */
-+#define DIAXIS_MECHA_TORSO 0x29010202 /* Tilts torso forward/backward */
-+#define DIAXIS_MECHA_ROTATE 0x29020203 /* Turns torso left/right */
-+#define DIAXIS_MECHA_THROTTLE 0x29038204 /* Engine Speed */
-+#define DIBUTTON_MECHA_FIRE 0x29000401 /* Fire */
-+#define DIBUTTON_MECHA_WEAPONS 0x29000402 /* Select next weapon group */
-+#define DIBUTTON_MECHA_TARGET 0x29000403 /* Select closest enemy available target */
-+#define DIBUTTON_MECHA_REVERSE 0x29000404 /* Toggles throttle in/out of reverse */
-+#define DIBUTTON_MECHA_ZOOM 0x29000405 /* Zoom in/out targeting reticule */
-+#define DIBUTTON_MECHA_JUMP 0x29000406 /* Fires jump jets */
-+#define DIBUTTON_MECHA_MENU 0x290004FD /* Show menu options */
-+/*--- Priority 2 controls ---*/
-+
-+#define DIBUTTON_MECHA_CENTER 0x29004407 /* Center torso to legs */
-+#define DIHATSWITCH_MECHA_GLANCE 0x29004601 /* Look around */
-+#define DIBUTTON_MECHA_VIEW 0x29004408 /* Cycle through view options */
-+#define DIBUTTON_MECHA_FIRESECONDARY 0x29004409 /* Alternative fire button */
-+#define DIBUTTON_MECHA_LEFT_LINK 0x2900C4E4 /* Fallback steer left button */
-+#define DIBUTTON_MECHA_RIGHT_LINK 0x2900C4EC /* Fallback steer right button */
-+#define DIBUTTON_MECHA_FORWARD_LINK 0x290144E0 /* Fallback tilt torso forward button */
-+#define DIBUTTON_MECHA_BACK_LINK 0x290144E8 /* Fallback tilt toroso backward button */
-+#define DIBUTTON_MECHA_ROTATE_LEFT_LINK 0x290244E4 /* Fallback rotate toroso right button */
-+#define DIBUTTON_MECHA_ROTATE_RIGHT_LINK 0x290244EC /* Fallback rotate torso left button */
-+#define DIBUTTON_MECHA_FASTER_LINK 0x2903C4E0 /* Fallback increase engine speed */
-+#define DIBUTTON_MECHA_SLOWER_LINK 0x2903C4E8 /* Fallback decrease engine speed */
-+#define DIBUTTON_MECHA_DEVICE 0x290044FE /* Show input device and controls */
-+#define DIBUTTON_MECHA_PAUSE 0x290044FC /* Start / Pause / Restart game */
-+
-+/*
-+ * "ANY" semantics can be used as a last resort to get mappings for actions
-+ * that match nothing in the chosen virtual genre. These semantics will be
-+ * mapped at a lower priority that virtual genre semantics. Also, hardware
-+ * vendors will not be able to provide sensible mappings for these unless
-+ * they provide application specific mappings.
-+ */
-+#define DIAXIS_ANY_X_1 0xFF00C201
-+#define DIAXIS_ANY_X_2 0xFF00C202
-+#define DIAXIS_ANY_Y_1 0xFF014201
-+#define DIAXIS_ANY_Y_2 0xFF014202
-+#define DIAXIS_ANY_Z_1 0xFF01C201
-+#define DIAXIS_ANY_Z_2 0xFF01C202
-+#define DIAXIS_ANY_R_1 0xFF024201
-+#define DIAXIS_ANY_R_2 0xFF024202
-+#define DIAXIS_ANY_U_1 0xFF02C201
-+#define DIAXIS_ANY_U_2 0xFF02C202
-+#define DIAXIS_ANY_V_1 0xFF034201
-+#define DIAXIS_ANY_V_2 0xFF034202
-+#define DIAXIS_ANY_A_1 0xFF03C201
-+#define DIAXIS_ANY_A_2 0xFF03C202
-+#define DIAXIS_ANY_B_1 0xFF044201
-+#define DIAXIS_ANY_B_2 0xFF044202
-+#define DIAXIS_ANY_C_1 0xFF04C201
-+#define DIAXIS_ANY_C_2 0xFF04C202
-+#define DIAXIS_ANY_S_1 0xFF054201
-+#define DIAXIS_ANY_S_2 0xFF054202
-+
-+#define DIAXIS_ANY_1 0xFF004201
-+#define DIAXIS_ANY_2 0xFF004202
-+#define DIAXIS_ANY_3 0xFF004203
-+#define DIAXIS_ANY_4 0xFF004204
-+
-+#define DIPOV_ANY_1 0xFF004601
-+#define DIPOV_ANY_2 0xFF004602
-+#define DIPOV_ANY_3 0xFF004603
-+#define DIPOV_ANY_4 0xFF004604
-+
-+#define DIBUTTON_ANY(instance) ( 0xFF004400 | instance )
-+
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* __DINPUT_INCLUDED__ */
-+
-+/****************************************************************************
-+ *
-+ * Definitions for non-IDirectInput (VJoyD) features defined more recently
-+ * than the current sdk files
-+ *
-+ ****************************************************************************/
-+
-+#ifdef _INC_MMSYSTEM
-+#ifndef MMNOJOY
-+
-+#ifndef __VJOYDX_INCLUDED__
-+#define __VJOYDX_INCLUDED__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Flag to indicate that the dwReserved2 field of the JOYINFOEX structure
-+ * contains mini-driver specific data to be passed by VJoyD to the mini-
-+ * driver instead of doing a poll.
-+ */
-+#define JOY_PASSDRIVERDATA 0x10000000l
-+
-+/*
-+ * Informs the joystick driver that the configuration has been changed
-+ * and should be reloaded from the registery.
-+ * dwFlags is reserved and should be set to zero
-+ */
-+WINMMAPI MMRESULT WINAPI joyConfigChanged( DWORD dwFlags );
-+
-+
-+/*
-+ * Hardware Setting indicating that the device is a headtracker
-+ */
-+#define JOY_HWS_ISHEADTRACKER 0x02000000l
-+
-+/*
-+ * Hardware Setting indicating that the VxD is used to replace
-+ * the standard analog polling
-+ */
-+#define JOY_HWS_ISGAMEPORTDRIVER 0x04000000l
-+
-+/*
-+ * Hardware Setting indicating that the driver needs a standard
-+ * gameport in order to communicate with the device.
-+ */
-+#define JOY_HWS_ISANALOGPORTDRIVER 0x08000000l
-+
-+/*
-+ * Hardware Setting indicating that VJoyD should not load this
-+ * driver, it will be loaded externally and will register with
-+ * VJoyD of it's own accord.
-+ */
-+#define JOY_HWS_AUTOLOAD 0x10000000l
-+
-+/*
-+ * Hardware Setting indicating that the driver acquires any
-+ * resources needed without needing a devnode through VJoyD.
-+ */
-+#define JOY_HWS_NODEVNODE 0x20000000l
-+
-+
-+/*
-+ * Hardware Setting indicating that the device is a gameport bus
-+ */
-+#define JOY_HWS_ISGAMEPORTBUS 0x80000000l
-+#define JOY_HWS_GAMEPORTBUSBUSY 0x00000001l
-+
-+/*
-+ * Usage Setting indicating that the settings are volatile and
-+ * should be removed if still present on a reboot.
-+ */
-+#define JOY_US_VOLATILE 0x00000008L
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* __VJOYDX_INCLUDED__ */
-+
-+#endif /* not MMNOJOY */
-+#endif /* _INC_MMSYSTEM */
-+
-+/****************************************************************************
-+ *
-+ * Definitions for non-IDirectInput (VJoyD) features defined more recently
-+ * than the current ddk files
-+ *
-+ ****************************************************************************/
-+
-+#ifndef DIJ_RINGZERO
-+
-+#ifdef _INC_MMDDK
-+#ifndef MMNOJOYDEV
-+
-+#ifndef __VJOYDXD_INCLUDED__
-+#define __VJOYDXD_INCLUDED__
-+/*
-+ * Poll type in which the do_other field of the JOYOEMPOLLDATA
-+ * structure contains mini-driver specific data passed from an app.
-+ */
-+#define JOY_OEMPOLL_PASSDRIVERDATA 7
-+
-+#endif /* __VJOYDXD_INCLUDED__ */
-+
-+#endif /* not MMNOJOYDEV */
-+#endif /* _INC_MMDDK */
-+
-+#endif /* DIJ_RINGZERO */
-+
-diff -ruN a/include/dsound.h b/include/dsound.h
---- a/include/dsound.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/dsound.h 2000-10-21 02:27:56.000000000 +0200
-@@ -0,0 +1,2345 @@
-+/*==========================================================================;
-+ *
-+ * Copyright (C) 1995-2000 Microsoft Corporation. All Rights Reserved.
-+ *
-+ * File: dsound.h
-+ * Content: DirectSound include file
-+ *
-+ **************************************************************************/
-+
-+#define COM_NO_WINDOWS_H
-+#include
-+#include
-+
-+#ifndef DIRECTSOUND_VERSION
-+#define DIRECTSOUND_VERSION 0x0800 /* Version 8.0 */
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif // __cplusplus
-+
-+#ifndef __DSOUND_INCLUDED__
-+#define __DSOUND_INCLUDED__
-+
-+/* Type definitions shared with Direct3D */
-+
-+#ifndef DX_SHARED_DEFINES
-+
-+typedef float D3DVALUE, *LPD3DVALUE;
-+
-+#ifndef D3DCOLOR_DEFINED
-+typedef DWORD D3DCOLOR;
-+#define D3DCOLOR_DEFINED
-+#endif
-+
-+#ifndef LPD3DCOLOR_DEFINED
-+typedef DWORD *LPD3DCOLOR;
-+#define LPD3DCOLOR_DEFINED
-+#endif
-+
-+#ifndef D3DVECTOR_DEFINED
-+typedef struct _D3DVECTOR {
-+ float x;
-+ float y;
-+ float z;
-+} D3DVECTOR;
-+#define D3DVECTOR_DEFINED
-+#endif
-+
-+#ifndef LPD3DVECTOR_DEFINED
-+typedef D3DVECTOR *LPD3DVECTOR;
-+#define LPD3DVECTOR_DEFINED
-+#endif
-+
-+#define DX_SHARED_DEFINES
-+#endif // DX_SHARED_DEFINES
-+
-+#define _FACDS 0x878 /* DirectSound's facility code */
-+#define MAKE_DSHRESULT(code) MAKE_HRESULT(1, _FACDS, code)
-+
-+// DirectSound Component GUID {47D4D946-62E8-11CF-93BC-444553540000}
-+DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-+
-+// DirectSound 8.0 Component GUID {3901CC3F-84B5-4FA4-BA35-AA8172B8A09B}
-+DEFINE_GUID(CLSID_DirectSound8, 0x3901cc3f, 0x84b5, 0x4fa4, 0xba, 0x35, 0xaa, 0x81, 0x72, 0xb8, 0xa0, 0x9b);
-+
-+// DirectSound Capture Component GUID {B0210780-89CD-11D0-AF08-00A0C925CD16}
-+DEFINE_GUID(CLSID_DirectSoundCapture, 0xb0210780, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
-+
-+// DirectSound 8.0 Capture Component GUID {E4BCAC13-7F99-4908-9A8E-74E3BF24B6E1}
-+DEFINE_GUID(CLSID_DirectSoundCapture8, 0xe4bcac13, 0x7f99, 0x4908, 0x9a, 0x8e, 0x74, 0xe3, 0xbf, 0x24, 0xb6, 0xe1);
-+
-+// DirectSound Full Duplex Component GUID {FEA4300C-7959-4147-B26A-2377B9E7A91D}
-+DEFINE_GUID(CLSID_DirectSoundFullDuplex, 0xfea4300c, 0x7959, 0x4147, 0xb2, 0x6a, 0x23, 0x77, 0xb9, 0xe7, 0xa9, 0x1d);
-+
-+
-+// DirectSound default playback device GUID {DEF00000-9C6D-47ED-AAF1-4DDA8F2B5C03}
-+DEFINE_GUID(DSDEVID_DefaultPlayback, 0xdef00000, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
-+
-+// DirectSound default capture device GUID {DEF00001-9C6D-47ED-AAF1-4DDA8F2B5C03}
-+DEFINE_GUID(DSDEVID_DefaultCapture, 0xdef00001, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
-+
-+// DirectSound default device for voice playback {DEF00002-9C6D-47ED-AAF1-4DDA8F2B5C03}
-+DEFINE_GUID(DSDEVID_DefaultVoicePlayback, 0xdef00002, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
-+
-+// DirectSound default device for voice capture {DEF00003-9C6D-47ED-AAF1-4DDA8F2B5C03}
-+DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xdef00003, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
-+
-+
-+//
-+// Forward declarations for interfaces.
-+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
-+//
-+
-+#ifdef __cplusplus
-+struct IDirectSound;
-+struct IDirectSoundBuffer;
-+struct IDirectSound3DListener;
-+struct IDirectSound3DBuffer;
-+struct IDirectSoundCapture;
-+struct IDirectSoundCaptureBuffer;
-+struct IDirectSoundNotify;
-+#endif // __cplusplus
-+
-+
-+//
-+// DirectSound 8.0 interfaces.
-+//
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+#ifdef __cplusplus
-+struct IDirectSound8;
-+struct IDirectSoundBuffer8;
-+struct IDirectSoundCaptureBuffer8;
-+struct IDirectSoundFXGargle;
-+struct IDirectSoundFXChorus;
-+struct IDirectSoundFXFlanger;
-+struct IDirectSoundFXEcho;
-+struct IDirectSoundFXDistortion;
-+struct IDirectSoundFXCompressor;
-+struct IDirectSoundFXParamEq;
-+struct IDirectSoundFXWavesReverb;
-+struct IDirectSoundFXI3DL2Reverb;
-+struct IDirectSoundCaptureFXAec;
-+struct IDirectSoundCaptureFXNoiseSuppress;
-+struct IDirectSoundFullDuplex;
-+#endif // __cplusplus
-+
-+// IDirectSound8, IDirectSoundBuffer8 and IDirectSoundCaptureBuffer8 are the
-+// only DirectSound 7.0 interfaces with changed functionality in version 8.0.
-+// The other level 8 interfaces as equivalent to their level 7 counterparts:
-+
-+#define IDirectSoundCapture8 IDirectSoundCapture
-+#define IDirectSound3DListener8 IDirectSound3DListener
-+#define IDirectSound3DBuffer8 IDirectSound3DBuffer
-+#define IDirectSoundNotify8 IDirectSoundNotify
-+#define IDirectSoundFXGargle8 IDirectSoundFXGargle
-+#define IDirectSoundFXChorus8 IDirectSoundFXChorus
-+#define IDirectSoundFXFlanger8 IDirectSoundFXFlanger
-+#define IDirectSoundFXEcho8 IDirectSoundFXEcho
-+#define IDirectSoundFXDistortion8 IDirectSoundFXDistortion
-+#define IDirectSoundFXCompressor8 IDirectSoundFXCompressor
-+#define IDirectSoundFXParamEq8 IDirectSoundFXParamEq
-+#define IDirectSoundFXWavesReverb8 IDirectSoundFXWavesReverb
-+#define IDirectSoundFXI3DL2Reverb8 IDirectSoundFXI3DL2Reverb
-+#define IDirectSoundCaptureFXAec8 IDirectSoundCaptureFXAec
-+#define IDirectSoundCaptureFXNoiseSuppress8 IDirectSoundCaptureFXNoiseSuppress
-+#define IDirectSoundFullDuplex8 IDirectSoundFullDuplex
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+
-+typedef struct IDirectSound *LPDIRECTSOUND;
-+typedef struct IDirectSoundBuffer *LPDIRECTSOUNDBUFFER;
-+typedef struct IDirectSound3DListener *LPDIRECTSOUND3DLISTENER;
-+typedef struct IDirectSound3DBuffer *LPDIRECTSOUND3DBUFFER;
-+typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE;
-+typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER;
-+typedef struct IDirectSoundNotify *LPDIRECTSOUNDNOTIFY;
-+
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+typedef struct IDirectSoundFXGargle *LPDIRECTSOUNDFXGARGLE;
-+typedef struct IDirectSoundFXChorus *LPDIRECTSOUNDFXCHORUS;
-+typedef struct IDirectSoundFXFlanger *LPDIRECTSOUNDFXFLANGER;
-+typedef struct IDirectSoundFXEcho *LPDIRECTSOUNDFXECHO;
-+typedef struct IDirectSoundFXDistortion *LPDIRECTSOUNDFXDISTORTION;
-+typedef struct IDirectSoundFXCompressor *LPDIRECTSOUNDFXCOMPRESSOR;
-+typedef struct IDirectSoundFXParamEq *LPDIRECTSOUNDFXPARAMEQ;
-+typedef struct IDirectSoundFXWavesReverb *LPDIRECTSOUNDFXWAVESREVERB;
-+typedef struct IDirectSoundFXI3DL2Reverb *LPDIRECTSOUNDFXI3DL2REVERB;
-+typedef struct IDirectSoundCaptureFXAec *LPDIRECTSOUNDCAPTUREFXAEC;
-+typedef struct IDirectSoundCaptureFXNoiseSuppress *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS;
-+typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX;
-+
-+typedef struct IDirectSound8 *LPDIRECTSOUND8;
-+typedef struct IDirectSoundBuffer8 *LPDIRECTSOUNDBUFFER8;
-+typedef struct IDirectSound3DListener8 *LPDIRECTSOUND3DLISTENER8;
-+typedef struct IDirectSound3DBuffer8 *LPDIRECTSOUND3DBUFFER8;
-+typedef struct IDirectSoundCapture8 *LPDIRECTSOUNDCAPTURE8;
-+typedef struct IDirectSoundCaptureBuffer8 *LPDIRECTSOUNDCAPTUREBUFFER8;
-+typedef struct IDirectSoundNotify8 *LPDIRECTSOUNDNOTIFY8;
-+typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8;
-+typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8;
-+typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8;
-+typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8;
-+typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8;
-+typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8;
-+typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8;
-+typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8;
-+typedef struct IDirectSoundFXI3DL2Reverb8 *LPDIRECTSOUNDFXI3DL2REVERB8;
-+typedef struct IDirectSoundCaptureFXAec8 *LPDIRECTSOUNDCAPTUREFXAEC8;
-+typedef struct IDirectSoundCaptureFXNoiseSuppress8 *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS8;
-+typedef struct IDirectSoundFullDuplex8 *LPDIRECTSOUNDFULLDUPLEX8;
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IID definitions for the unchanged DirectSound 8.0 interfaces
-+//
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+#define IID_IDirectSoundCapture8 IID_IDirectSoundCapture
-+#define IID_IDirectSound3DListener8 IID_IDirectSound3DListener
-+#define IID_IDirectSound3DBuffer8 IID_IDirectSound3DBuffer
-+#define IID_IDirectSoundNotify8 IID_IDirectSoundNotify
-+#define IID_IDirectSoundFXGargle8 IID_IDirectSoundFXGargle
-+#define IID_IDirectSoundFXChorus8 IID_IDirectSoundFXChorus
-+#define IID_IDirectSoundFXFlanger8 IID_IDirectSoundFXFlanger
-+#define IID_IDirectSoundFXEcho8 IID_IDirectSoundFXEcho
-+#define IID_IDirectSoundFXDistortion8 IID_IDirectSoundFXDistortion
-+#define IID_IDirectSoundFXCompressor8 IID_IDirectSoundFXCompressor
-+#define IID_IDirectSoundFXParamEq8 IID_IDirectSoundFXParamEq
-+#define IID_IDirectSoundFXWavesReverb8 IID_IDirectSoundFXWavesReverb
-+#define IID_IDirectSoundFXI3DL2Reverb8 IID_IDirectSoundFXI3DL2Reverb
-+#define IID_IDirectSoundCaptureFXAec8 IID_IDirectSoundCaptureFXAec
-+#define IID_IDirectSoundCaptureFXNoiseSuppress8 IID_IDirectSoundCaptureFXNoiseSuppress
-+#define IID_IDirectSoundFullDuplex8 IID_IDirectSoundFullDuplex
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// Compatibility typedefs
-+//
-+
-+#ifndef _LPCWAVEFORMATEX_DEFINED
-+#define _LPCWAVEFORMATEX_DEFINED
-+typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
-+#endif // _LPCWAVEFORMATEX_DEFINED
-+
-+#ifndef __LPCGUID_DEFINED__
-+#define __LPCGUID_DEFINED__
-+typedef const GUID *LPCGUID;
-+#endif // __LPCGUID_DEFINED__
-+
-+typedef LPDIRECTSOUND *LPLPDIRECTSOUND;
-+typedef LPDIRECTSOUNDBUFFER *LPLPDIRECTSOUNDBUFFER;
-+typedef LPDIRECTSOUND3DLISTENER *LPLPDIRECTSOUND3DLISTENER;
-+typedef LPDIRECTSOUND3DBUFFER *LPLPDIRECTSOUND3DBUFFER;
-+typedef LPDIRECTSOUNDCAPTURE *LPLPDIRECTSOUNDCAPTURE;
-+typedef LPDIRECTSOUNDCAPTUREBUFFER *LPLPDIRECTSOUNDCAPTUREBUFFER;
-+typedef LPDIRECTSOUNDNOTIFY *LPLPDIRECTSOUNDNOTIFY;
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+typedef LPDIRECTSOUND8 *LPLPDIRECTSOUND8;
-+typedef LPDIRECTSOUNDBUFFER8 *LPLPDIRECTSOUNDBUFFER8;
-+typedef LPDIRECTSOUNDCAPTURE8 *LPLPDIRECTSOUNDCAPTURE8;
-+typedef LPDIRECTSOUNDCAPTUREBUFFER8 *LPLPDIRECTSOUNDCAPTUREBUFFER8;
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// Structures
-+//
-+
-+typedef struct _DSCAPS
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwMinSecondarySampleRate;
-+ DWORD dwMaxSecondarySampleRate;
-+ DWORD dwPrimaryBuffers;
-+ DWORD dwMaxHwMixingAllBuffers;
-+ DWORD dwMaxHwMixingStaticBuffers;
-+ DWORD dwMaxHwMixingStreamingBuffers;
-+ DWORD dwFreeHwMixingAllBuffers;
-+ DWORD dwFreeHwMixingStaticBuffers;
-+ DWORD dwFreeHwMixingStreamingBuffers;
-+ DWORD dwMaxHw3DAllBuffers;
-+ DWORD dwMaxHw3DStaticBuffers;
-+ DWORD dwMaxHw3DStreamingBuffers;
-+ DWORD dwFreeHw3DAllBuffers;
-+ DWORD dwFreeHw3DStaticBuffers;
-+ DWORD dwFreeHw3DStreamingBuffers;
-+ DWORD dwTotalHwMemBytes;
-+ DWORD dwFreeHwMemBytes;
-+ DWORD dwMaxContigFreeHwMemBytes;
-+ DWORD dwUnlockTransferRateHwBuffers;
-+ DWORD dwPlayCpuOverheadSwBuffers;
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+} DSCAPS, *LPDSCAPS;
-+
-+typedef const DSCAPS *LPCDSCAPS;
-+
-+typedef struct _DSBCAPS
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwUnlockTransferRate;
-+ DWORD dwPlayCpuOverhead;
-+} DSBCAPS, *LPDSBCAPS;
-+
-+typedef const DSBCAPS *LPCDSBCAPS;
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+ typedef struct _DSEFFECTDESC
-+ {
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ GUID guidDSFXClass;
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ } DSEFFECTDESC, *LPDSEFFECTDESC;
-+ typedef const DSEFFECTDESC *LPCDSEFFECTDESC;
-+
-+ #define DSFX_LOCHARDWARE 0x00000001
-+ #define DSFX_LOCSOFTWARE 0x00000002
-+
-+ enum
-+ {
-+ DSFXR_PRESENT, // 0
-+ DSFXR_LOCHARDWARE, // 1
-+ DSFXR_LOCSOFTWARE, // 2
-+ DSFXR_UNALLOCATED, // 3
-+ DSFXR_FAILED, // 4
-+ DSFXR_UNKNOWN, // 5
-+ DSFXR_SENDLOOP // 6
-+ };
-+
-+ typedef struct _DSCEFFECTDESC
-+ {
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ GUID guidDSCFXClass;
-+ GUID guidDSCFXInstance;
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ } DSCEFFECTDESC, *LPDSCEFFECTDESC;
-+ typedef const DSCEFFECTDESC *LPCDSCEFFECTDESC;
-+
-+ #define DSCFX_LOCHARDWARE 0x00000001
-+ #define DSCFX_LOCSOFTWARE 0x00000002
-+
-+ #define DSCFXR_LOCHARDWARE 0x00000010
-+ #define DSCFXR_LOCSOFTWARE 0x00000020
-+ #define DSCFXR_UNALLOCATED 0x00000040
-+ #define DSCFXR_FAILED 0x00000080
-+ #define DSCFXR_UNKNOWN 0x00000100
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+typedef struct _DSBUFFERDESC
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwReserved;
-+ LPWAVEFORMATEX lpwfxFormat;
-+#if DIRECTSOUND_VERSION >= 0x0700
-+ GUID guid3DAlgorithm;
-+#endif
-+} DSBUFFERDESC, *LPDSBUFFERDESC;
-+
-+typedef const DSBUFFERDESC *LPCDSBUFFERDESC;
-+
-+// Older version of this structure:
-+
-+typedef struct _DSBUFFERDESC1
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwReserved;
-+ LPWAVEFORMATEX lpwfxFormat;
-+} DSBUFFERDESC1, *LPDSBUFFERDESC1;
-+
-+typedef const DSBUFFERDESC1 *LPCDSBUFFERDESC1;
-+
-+typedef struct _DS3DBUFFER
-+{
-+ DWORD dwSize;
-+ D3DVECTOR vPosition;
-+ D3DVECTOR vVelocity;
-+ DWORD dwInsideConeAngle;
-+ DWORD dwOutsideConeAngle;
-+ D3DVECTOR vConeOrientation;
-+ LONG lConeOutsideVolume;
-+ D3DVALUE flMinDistance;
-+ D3DVALUE flMaxDistance;
-+ DWORD dwMode;
-+} DS3DBUFFER, *LPDS3DBUFFER;
-+
-+typedef const DS3DBUFFER *LPCDS3DBUFFER;
-+
-+typedef struct _DS3DLISTENER
-+{
-+ DWORD dwSize;
-+ D3DVECTOR vPosition;
-+ D3DVECTOR vVelocity;
-+ D3DVECTOR vOrientFront;
-+ D3DVECTOR vOrientTop;
-+ D3DVALUE flDistanceFactor;
-+ D3DVALUE flRolloffFactor;
-+ D3DVALUE flDopplerFactor;
-+} DS3DLISTENER, *LPDS3DLISTENER;
-+
-+typedef const DS3DLISTENER *LPCDS3DLISTENER;
-+
-+typedef struct _DSCCAPS
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwFormats;
-+ DWORD dwChannels;
-+} DSCCAPS, *LPDSCCAPS;
-+
-+typedef const DSCCAPS *LPCDSCCAPS;
-+
-+typedef struct _DSCBUFFERDESC1
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwReserved;
-+ LPWAVEFORMATEX lpwfxFormat;
-+} DSCBUFFERDESC1, *LPDSCBUFFERDESC1;
-+
-+typedef struct _DSCBUFFERDESC
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwReserved;
-+ LPWAVEFORMATEX lpwfxFormat;
-+#if DIRECTSOUND_VERSION >= 0x0800
-+ DWORD dwFXCount;
-+ LPDSCEFFECTDESC lpDSCFXDesc;
-+#endif
-+} DSCBUFFERDESC, *LPDSCBUFFERDESC;
-+
-+typedef const DSCBUFFERDESC *LPCDSCBUFFERDESC;
-+
-+typedef struct _DSCBCAPS
-+{
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ DWORD dwBufferBytes;
-+ DWORD dwReserved;
-+} DSCBCAPS, *LPDSCBCAPS;
-+
-+typedef const DSCBCAPS *LPCDSCBCAPS;
-+
-+typedef struct _DSBPOSITIONNOTIFY
-+{
-+ DWORD dwOffset;
-+ HANDLE hEventNotify;
-+} DSBPOSITIONNOTIFY, *LPDSBPOSITIONNOTIFY;
-+
-+typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
-+
-+//
-+// DirectSound API
-+//
-+
-+typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID, LPCSTR, LPCSTR, LPVOID);
-+typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID, LPCWSTR, LPCWSTR, LPVOID);
-+
-+extern HRESULT WINAPI DirectSoundCreate(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);
-+extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext);
-+extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
-+
-+extern HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE *ppDSC, LPUNKNOWN pUnkOuter);
-+extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext);
-+extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+extern HRESULT WINAPI DirectSoundCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUND8 *ppDS8, LPUNKNOWN pUnkOuter);
-+extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter);
-+extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice,
-+ LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd,
-+ DWORD dwLevel, LPDIRECTSOUNDFULLDUPLEX* ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8,
-+ LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter);
-+#define DirectSoundFullDuplexCreate8 DirectSoundFullDuplexCreate
-+
-+extern HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest);
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+#ifdef UNICODE
-+#define LPDSENUMCALLBACK LPDSENUMCALLBACKW
-+#define DirectSoundEnumerate DirectSoundEnumerateW
-+#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateW
-+#else // UNICODE
-+#define LPDSENUMCALLBACK LPDSENUMCALLBACKA
-+#define DirectSoundEnumerate DirectSoundEnumerateA
-+#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateA
-+#endif // UNICODE
-+
-+//
-+// IUnknown
-+//
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#ifndef IUnknown_QueryInterface
-+#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#endif // IUnknown_QueryInterface
-+#ifndef IUnknown_AddRef
-+#define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#endif // IUnknown_AddRef
-+#ifndef IUnknown_Release
-+#define IUnknown_Release(p) (p)->lpVtbl->Release(p)
-+#endif // IUnknown_Release
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#ifndef IUnknown_QueryInterface
-+#define IUnknown_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#endif // IUnknown_QueryInterface
-+#ifndef IUnknown_AddRef
-+#define IUnknown_AddRef(p) (p)->AddRef()
-+#endif // IUnknown_AddRef
-+#ifndef IUnknown_Release
-+#define IUnknown_Release(p) (p)->Release()
-+#endif // IUnknown_Release
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#ifndef __IReferenceClock_INTERFACE_DEFINED__
-+#define __IReferenceClock_INTERFACE_DEFINED__
-+
-+typedef LONGLONG REFERENCE_TIME;
-+typedef REFERENCE_TIME *LPREFERENCE_TIME;
-+
-+DEFINE_GUID(IID_IReferenceClock, 0x56a86897, 0x0ad4, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+
-+#undef INTERFACE
-+#define INTERFACE IReferenceClock
-+
-+DECLARE_INTERFACE_(IReferenceClock, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IReferenceClock methods
-+ STDMETHOD(GetTime) (THIS_ REFERENCE_TIME *pTime) PURE;
-+ STDMETHOD(AdviseTime) (THIS_ REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime,
-+ HANDLE hEvent, LPDWORD pdwAdviseCookie) PURE;
-+ STDMETHOD(AdvisePeriodic) (THIS_ REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime,
-+ HANDLE hSemaphore, LPDWORD pdwAdviseCookie) PURE;
-+ STDMETHOD(Unadvise) (THIS_ DWORD dwAdviseCookie) PURE;
-+};
-+
-+#endif // __IReferenceClock_INTERFACE_DEFINED__
-+
-+#ifndef IReferenceClock_QueryInterface
-+
-+#define IReferenceClock_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IReferenceClock_AddRef(p) IUnknown_AddRef(p)
-+#define IReferenceClock_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IReferenceClock_GetTime(p,a) (p)->lpVtbl->GetTime(p,a)
-+#define IReferenceClock_AdviseTime(p,a,b,c,d) (p)->lpVtbl->AdviseTime(p,a,b,c,d)
-+#define IReferenceClock_AdvisePeriodic(p,a,b,c,d) (p)->lpVtbl->AdvisePeriodic(p,a,b,c,d)
-+#define IReferenceClock_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IReferenceClock_GetTime(p,a) (p)->GetTime(a)
-+#define IReferenceClock_AdviseTime(p,a,b,c,d) (p)->AdviseTime(a,b,c,d)
-+#define IReferenceClock_AdvisePeriodic(p,a,b,c,d) (p)->AdvisePeriodic(a,b,c,d)
-+#define IReferenceClock_Unadvise(p,a) (p)->Unadvise(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // IReferenceClock_QueryInterface
-+
-+//
-+// IDirectSound
-+//
-+
-+DEFINE_GUID(IID_IDirectSound, 0x279AFA83, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSound
-+
-+DECLARE_INTERFACE_(IDirectSound, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSound methods
-+ STDMETHOD(CreateSoundBuffer) (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE;
-+ STDMETHOD(GetCaps) (THIS_ LPDSCAPS pDSCaps) PURE;
-+ STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE;
-+ STDMETHOD(SetCooperativeLevel) (THIS_ HWND hwnd, DWORD dwLevel) PURE;
-+ STDMETHOD(Compact) (THIS) PURE;
-+ STDMETHOD(GetSpeakerConfig) (THIS_ LPDWORD pdwSpeakerConfig) PURE;
-+ STDMETHOD(SetSpeakerConfig) (THIS_ DWORD dwSpeakerConfig) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE;
-+};
-+
-+#define IDirectSound_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSound_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSound_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->lpVtbl->CreateSoundBuffer(p,a,b,c)
-+#define IDirectSound_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b)
-+#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectSound_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectSound_GetSpeakerConfig(p,a) (p)->lpVtbl->GetSpeakerConfig(p,a)
-+#define IDirectSound_SetSpeakerConfig(p,b) (p)->lpVtbl->SetSpeakerConfig(p,b)
-+#define IDirectSound_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->CreateSoundBuffer(a,b,c)
-+#define IDirectSound_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->DuplicateSoundBuffer(a,b)
-+#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectSound_Compact(p) (p)->Compact()
-+#define IDirectSound_GetSpeakerConfig(p,a) (p)->GetSpeakerConfig(a)
-+#define IDirectSound_SetSpeakerConfig(p,b) (p)->SetSpeakerConfig(b)
-+#define IDirectSound_Initialize(p,a) (p)->Initialize(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSound8
-+//
-+
-+DEFINE_GUID(IID_IDirectSound8, 0xC50A7E93, 0xF395, 0x4834, 0x9E, 0xF6, 0x7F, 0xA9, 0x9D, 0xE5, 0x09, 0x66);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSound8
-+
-+DECLARE_INTERFACE_(IDirectSound8, IDirectSound)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSound methods
-+ STDMETHOD(CreateSoundBuffer) (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE;
-+ STDMETHOD(GetCaps) (THIS_ LPDSCAPS pDSCaps) PURE;
-+ STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE;
-+ STDMETHOD(SetCooperativeLevel) (THIS_ HWND hwnd, DWORD dwLevel) PURE;
-+ STDMETHOD(Compact) (THIS) PURE;
-+ STDMETHOD(GetSpeakerConfig) (THIS_ LPDWORD pdwSpeakerConfig) PURE;
-+ STDMETHOD(SetSpeakerConfig) (THIS_ DWORD dwSpeakerConfig) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE;
-+
-+ // IDirectSound8 methods
-+ STDMETHOD(VerifyCertification) (THIS_ LPDWORD pdwCertified) PURE;
-+};
-+
-+#define IDirectSound8_QueryInterface(p,a,b) IDirectSound_QueryInterface(p,a,b)
-+#define IDirectSound8_AddRef(p) IDirectSound_AddRef(p)
-+#define IDirectSound8_Release(p) IDirectSound_Release(p)
-+#define IDirectSound8_CreateSoundBuffer(p,a,b,c) IDirectSound_CreateSoundBuffer(p,a,b,c)
-+#define IDirectSound8_GetCaps(p,a) IDirectSound_GetCaps(p,a)
-+#define IDirectSound8_DuplicateSoundBuffer(p,a,b) IDirectSound_DuplicateSoundBuffer(p,a,b)
-+#define IDirectSound8_SetCooperativeLevel(p,a,b) IDirectSound_SetCooperativeLevel(p,a,b)
-+#define IDirectSound8_Compact(p) IDirectSound_Compact(p)
-+#define IDirectSound8_GetSpeakerConfig(p,a) IDirectSound_GetSpeakerConfig(p,a)
-+#define IDirectSound8_SetSpeakerConfig(p,a) IDirectSound_SetSpeakerConfig(p,a)
-+#define IDirectSound8_Initialize(p,a) IDirectSound_Initialize(p,a)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound8_VerifyCertification(p,a) (p)->lpVtbl->VerifyCertification(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound8_VerifyCertification(p,a) (p)->VerifyCertification(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSoundBuffer
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundBuffer
-+
-+DECLARE_INTERFACE_(IDirectSoundBuffer, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundBuffer methods
-+ STDMETHOD(GetCaps) (THIS_ LPDSBCAPS pDSBufferCaps) PURE;
-+ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE;
-+ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
-+ STDMETHOD(GetVolume) (THIS_ LPLONG plVolume) PURE;
-+ STDMETHOD(GetPan) (THIS_ LPLONG plPan) PURE;
-+ STDMETHOD(GetFrequency) (THIS_ LPDWORD pdwFrequency) PURE;
-+ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE;
-+ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
-+ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
-+ STDMETHOD(Play) (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE;
-+ STDMETHOD(SetCurrentPosition) (THIS_ DWORD dwNewPosition) PURE;
-+ STDMETHOD(SetFormat) (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE;
-+ STDMETHOD(SetVolume) (THIS_ LONG lVolume) PURE;
-+ STDMETHOD(SetPan) (THIS_ LONG lPan) PURE;
-+ STDMETHOD(SetFrequency) (THIS_ DWORD dwFrequency) PURE;
-+ STDMETHOD(Stop) (THIS) PURE;
-+ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
-+ STDMETHOD(Restore) (THIS) PURE;
-+};
-+
-+#define IDirectSoundBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundBuffer_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundBuffer_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
-+#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
-+#define IDirectSoundBuffer_GetVolume(p,a) (p)->lpVtbl->GetVolume(p,a)
-+#define IDirectSoundBuffer_GetPan(p,a) (p)->lpVtbl->GetPan(p,a)
-+#define IDirectSoundBuffer_GetFrequency(p,a) (p)->lpVtbl->GetFrequency(p,a)
-+#define IDirectSoundBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
-+#define IDirectSoundBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
-+#define IDirectSoundBuffer_Play(p,a,b,c) (p)->lpVtbl->Play(p,a,b,c)
-+#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->lpVtbl->SetCurrentPosition(p,a)
-+#define IDirectSoundBuffer_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a)
-+#define IDirectSoundBuffer_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a)
-+#define IDirectSoundBuffer_SetPan(p,a) (p)->lpVtbl->SetPan(p,a)
-+#define IDirectSoundBuffer_SetFrequency(p,a) (p)->lpVtbl->SetFrequency(p,a)
-+#define IDirectSoundBuffer_Stop(p) (p)->lpVtbl->Stop(p)
-+#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
-+#define IDirectSoundBuffer_Restore(p) (p)->lpVtbl->Restore(p)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundBuffer_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
-+#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
-+#define IDirectSoundBuffer_GetVolume(p,a) (p)->GetVolume(a)
-+#define IDirectSoundBuffer_GetPan(p,a) (p)->GetPan(a)
-+#define IDirectSoundBuffer_GetFrequency(p,a) (p)->GetFrequency(a)
-+#define IDirectSoundBuffer_GetStatus(p,a) (p)->GetStatus(a)
-+#define IDirectSoundBuffer_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
-+#define IDirectSoundBuffer_Play(p,a,b,c) (p)->Play(a,b,c)
-+#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->SetCurrentPosition(a)
-+#define IDirectSoundBuffer_SetFormat(p,a) (p)->SetFormat(a)
-+#define IDirectSoundBuffer_SetVolume(p,a) (p)->SetVolume(a)
-+#define IDirectSoundBuffer_SetPan(p,a) (p)->SetPan(a)
-+#define IDirectSoundBuffer_SetFrequency(p,a) (p)->SetFrequency(a)
-+#define IDirectSoundBuffer_Stop(p) (p)->Stop()
-+#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
-+#define IDirectSoundBuffer_Restore(p) (p)->Restore()
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSoundBuffer8
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundBuffer8, 0x6825a449, 0x7524, 0x4d82, 0x92, 0x0f, 0x50, 0xe3, 0x6a, 0xb3, 0xab, 0x1e);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundBuffer8
-+
-+DECLARE_INTERFACE_(IDirectSoundBuffer8, IDirectSoundBuffer)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundBuffer methods
-+ STDMETHOD(GetCaps) (THIS_ LPDSBCAPS pDSBufferCaps) PURE;
-+ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE;
-+ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
-+ STDMETHOD(GetVolume) (THIS_ LPLONG plVolume) PURE;
-+ STDMETHOD(GetPan) (THIS_ LPLONG plPan) PURE;
-+ STDMETHOD(GetFrequency) (THIS_ LPDWORD pdwFrequency) PURE;
-+ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE;
-+ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
-+ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
-+ STDMETHOD(Play) (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE;
-+ STDMETHOD(SetCurrentPosition) (THIS_ DWORD dwNewPosition) PURE;
-+ STDMETHOD(SetFormat) (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE;
-+ STDMETHOD(SetVolume) (THIS_ LONG lVolume) PURE;
-+ STDMETHOD(SetPan) (THIS_ LONG lPan) PURE;
-+ STDMETHOD(SetFrequency) (THIS_ DWORD dwFrequency) PURE;
-+ STDMETHOD(Stop) (THIS) PURE;
-+ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
-+ STDMETHOD(Restore) (THIS) PURE;
-+
-+ // IDirectSoundBuffer8 methods
-+ STDMETHOD(SetFX) (THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE;
-+ STDMETHOD(AcquireResources) (THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE;
-+ STDMETHOD(GetObjectInPath) (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
-+};
-+
-+// Special GUID meaning "select all objects" for use in GetObjectInPath()
-+DEFINE_GUID(GUID_All_Objects, 0xaa114de5, 0xc262, 0x4169, 0xa1, 0xc8, 0x23, 0xd6, 0x98, 0xcc, 0x73, 0xb5);
-+
-+#define IDirectSoundBuffer8_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundBuffer8_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundBuffer8_Release(p) IUnknown_Release(p)
-+
-+#define IDirectSoundBuffer8_GetCaps(p,a) IDirectSoundBuffer_GetCaps(p,a)
-+#define IDirectSoundBuffer8_GetCurrentPosition(p,a,b) IDirectSoundBuffer_GetCurrentPosition(p,a,b)
-+#define IDirectSoundBuffer8_GetFormat(p,a,b,c) IDirectSoundBuffer_GetFormat(p,a,b,c)
-+#define IDirectSoundBuffer8_GetVolume(p,a) IDirectSoundBuffer_GetVolume(p,a)
-+#define IDirectSoundBuffer8_GetPan(p,a) IDirectSoundBuffer_GetPan(p,a)
-+#define IDirectSoundBuffer8_GetFrequency(p,a) IDirectSoundBuffer_GetFrequency(p,a)
-+#define IDirectSoundBuffer8_GetStatus(p,a) IDirectSoundBuffer_GetStatus(p,a)
-+#define IDirectSoundBuffer8_Initialize(p,a,b) IDirectSoundBuffer_Initialize(p,a,b)
-+#define IDirectSoundBuffer8_Lock(p,a,b,c,d,e,f,g) IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)
-+#define IDirectSoundBuffer8_Play(p,a,b,c) IDirectSoundBuffer_Play(p,a,b,c)
-+#define IDirectSoundBuffer8_SetCurrentPosition(p,a) IDirectSoundBuffer_SetCurrentPosition(p,a)
-+#define IDirectSoundBuffer8_SetFormat(p,a) IDirectSoundBuffer_SetFormat(p,a)
-+#define IDirectSoundBuffer8_SetVolume(p,a) IDirectSoundBuffer_SetVolume(p,a)
-+#define IDirectSoundBuffer8_SetPan(p,a) IDirectSoundBuffer_SetPan(p,a)
-+#define IDirectSoundBuffer8_SetFrequency(p,a) IDirectSoundBuffer_SetFrequency(p,a)
-+#define IDirectSoundBuffer8_Stop(p) IDirectSoundBuffer_Stop(p)
-+#define IDirectSoundBuffer8_Unlock(p,a,b,c,d) IDirectSoundBuffer_Unlock(p,a,b,c,d)
-+#define IDirectSoundBuffer8_Restore(p) IDirectSoundBuffer_Restore(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->lpVtbl->SetFX(p,a,b,c)
-+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->lpVtbl->AcquireResources(p,a,b,c)
-+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->SetFX(a,b,c)
-+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->AcquireResources(a,b,c)
-+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSound3DListener
-+//
-+
-+DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSound3DListener
-+
-+DECLARE_INTERFACE_(IDirectSound3DListener, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSound3DListener methods
-+ STDMETHOD(GetAllParameters) (THIS_ LPDS3DLISTENER pListener) PURE;
-+ STDMETHOD(GetDistanceFactor) (THIS_ D3DVALUE* pflDistanceFactor) PURE;
-+ STDMETHOD(GetDopplerFactor) (THIS_ D3DVALUE* pflDopplerFactor) PURE;
-+ STDMETHOD(GetOrientation) (THIS_ D3DVECTOR* pvOrientFront, D3DVECTOR* pvOrientTop) PURE;
-+ STDMETHOD(GetPosition) (THIS_ D3DVECTOR* pvPosition) PURE;
-+ STDMETHOD(GetRolloffFactor) (THIS_ D3DVALUE* pflRolloffFactor) PURE;
-+ STDMETHOD(GetVelocity) (THIS_ D3DVECTOR* pvVelocity) PURE;
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDS3DLISTENER pcListener, DWORD dwApply) PURE;
-+ STDMETHOD(SetDistanceFactor) (THIS_ D3DVALUE flDistanceFactor, DWORD dwApply) PURE;
-+ STDMETHOD(SetDopplerFactor) (THIS_ D3DVALUE flDopplerFactor, DWORD dwApply) PURE;
-+ STDMETHOD(SetOrientation) (THIS_ D3DVALUE xFront, D3DVALUE yFront, D3DVALUE zFront,
-+ D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop, DWORD dwApply) PURE;
-+ STDMETHOD(SetPosition) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
-+ STDMETHOD(SetRolloffFactor) (THIS_ D3DVALUE flRolloffFactor, DWORD dwApply) PURE;
-+ STDMETHOD(SetVelocity) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
-+ STDMETHOD(CommitDeferredSettings) (THIS) PURE;
-+};
-+
-+#define IDirectSound3DListener_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSound3DListener_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSound3DListener_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound3DListener_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->lpVtbl->GetDistanceFactor(p,a)
-+#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->lpVtbl->GetDopplerFactor(p,a)
-+#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->lpVtbl->GetOrientation(p,a,b)
-+#define IDirectSound3DListener_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a)
-+#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->lpVtbl->GetRolloffFactor(p,a)
-+#define IDirectSound3DListener_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a)
-+#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b)
-+#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->lpVtbl->SetDistanceFactor(p,a,b)
-+#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->lpVtbl->SetDopplerFactor(p,a,b)
-+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->lpVtbl->SetOrientation(p,a,b,c,d,e,f,g)
-+#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d)
-+#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->lpVtbl->SetRolloffFactor(p,a,b)
-+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d)
-+#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->lpVtbl->CommitDeferredSettings(p)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound3DListener_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->GetDistanceFactor(a)
-+#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->GetDopplerFactor(a)
-+#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->GetOrientation(a,b)
-+#define IDirectSound3DListener_GetPosition(p,a) (p)->GetPosition(a)
-+#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->GetRolloffFactor(a)
-+#define IDirectSound3DListener_GetVelocity(p,a) (p)->GetVelocity(a)
-+#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b)
-+#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->SetDistanceFactor(a,b)
-+#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->SetDopplerFactor(a,b)
-+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->SetOrientation(a,b,c,d,e,f,g)
-+#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d)
-+#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->SetRolloffFactor(a,b)
-+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d)
-+#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->CommitDeferredSettings()
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSound3DBuffer
-+//
-+
-+DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSound3DBuffer
-+
-+DECLARE_INTERFACE_(IDirectSound3DBuffer, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSound3DBuffer methods
-+ STDMETHOD(GetAllParameters) (THIS_ LPDS3DBUFFER pDs3dBuffer) PURE;
-+ STDMETHOD(GetConeAngles) (THIS_ LPDWORD pdwInsideConeAngle, LPDWORD pdwOutsideConeAngle) PURE;
-+ STDMETHOD(GetConeOrientation) (THIS_ D3DVECTOR* pvOrientation) PURE;
-+ STDMETHOD(GetConeOutsideVolume) (THIS_ LPLONG plConeOutsideVolume) PURE;
-+ STDMETHOD(GetMaxDistance) (THIS_ D3DVALUE* pflMaxDistance) PURE;
-+ STDMETHOD(GetMinDistance) (THIS_ D3DVALUE* pflMinDistance) PURE;
-+ STDMETHOD(GetMode) (THIS_ LPDWORD pdwMode) PURE;
-+ STDMETHOD(GetPosition) (THIS_ D3DVECTOR* pvPosition) PURE;
-+ STDMETHOD(GetVelocity) (THIS_ D3DVECTOR* pvVelocity) PURE;
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDS3DBUFFER pcDs3dBuffer, DWORD dwApply) PURE;
-+ STDMETHOD(SetConeAngles) (THIS_ DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply) PURE;
-+ STDMETHOD(SetConeOrientation) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
-+ STDMETHOD(SetConeOutsideVolume) (THIS_ LONG lConeOutsideVolume, DWORD dwApply) PURE;
-+ STDMETHOD(SetMaxDistance) (THIS_ D3DVALUE flMaxDistance, DWORD dwApply) PURE;
-+ STDMETHOD(SetMinDistance) (THIS_ D3DVALUE flMinDistance, DWORD dwApply) PURE;
-+ STDMETHOD(SetMode) (THIS_ DWORD dwMode, DWORD dwApply) PURE;
-+ STDMETHOD(SetPosition) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
-+ STDMETHOD(SetVelocity) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
-+};
-+
-+#define IDirectSound3DBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSound3DBuffer_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSound3DBuffer_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->lpVtbl->GetConeAngles(p,a,b)
-+#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->lpVtbl->GetConeOrientation(p,a)
-+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->lpVtbl->GetConeOutsideVolume(p,a)
-+#define IDirectSound3DBuffer_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a)
-+#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->lpVtbl->GetMinDistance(p,a)
-+#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->lpVtbl->GetMaxDistance(p,a)
-+#define IDirectSound3DBuffer_GetMode(p,a) (p)->lpVtbl->GetMode(p,a)
-+#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a)
-+#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b)
-+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->lpVtbl->SetConeAngles(p,a,b,c)
-+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->lpVtbl->SetConeOrientation(p,a,b,c,d)
-+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->lpVtbl->SetConeOutsideVolume(p,a,b)
-+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d)
-+#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->lpVtbl->SetMinDistance(p,a,b)
-+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->lpVtbl->SetMaxDistance(p,a,b)
-+#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->lpVtbl->SetMode(p,a,b)
-+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->GetConeAngles(a,b)
-+#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->GetConeOrientation(a)
-+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->GetConeOutsideVolume(a)
-+#define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a)
-+#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->GetMinDistance(a)
-+#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->GetMaxDistance(a)
-+#define IDirectSound3DBuffer_GetMode(p,a) (p)->GetMode(a)
-+#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a)
-+#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b)
-+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c)
-+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d)
-+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b)
-+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d)
-+#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->SetMinDistance(a,b)
-+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b)
-+#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->SetMode(a,b)
-+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundCapture
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundCapture, 0xb0210781, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundCapture
-+
-+DECLARE_INTERFACE_(IDirectSoundCapture, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundCapture methods
-+ STDMETHOD(CreateCaptureBuffer) (THIS_ LPCDSCBUFFERDESC pcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER *ppDSCBuffer, LPUNKNOWN pUnkOuter) PURE;
-+ STDMETHOD(GetCaps) (THIS_ LPDSCCAPS pDSCCaps) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE;
-+};
-+
-+#define IDirectSoundCapture_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundCapture_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundCapture_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->lpVtbl->CreateCaptureBuffer(p,a,b,c)
-+#define IDirectSoundCapture_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectSoundCapture_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->CreateCaptureBuffer(a,b,c)
-+#define IDirectSoundCapture_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectSoundCapture_Initialize(p,a) (p)->Initialize(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundCaptureBuffer
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundCaptureBuffer, 0xb0210782, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundCaptureBuffer
-+
-+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundCaptureBuffer methods
-+ STDMETHOD(GetCaps) (THIS_ LPDSCBCAPS pDSCBCaps) PURE;
-+ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE;
-+ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
-+ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE;
-+ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
-+ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
-+ STDMETHOD(Start) (THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(Stop) (THIS) PURE;
-+ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
-+};
-+
-+#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundCaptureBuffer_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundCaptureBuffer_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
-+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
-+#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
-+#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
-+#define IDirectSoundCaptureBuffer_Start(p,a) (p)->lpVtbl->Start(p,a)
-+#define IDirectSoundCaptureBuffer_Stop(p) (p)->lpVtbl->Stop(p)
-+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
-+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
-+#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->GetStatus(a)
-+#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
-+#define IDirectSoundCaptureBuffer_Start(p,a) (p)->Start(a)
-+#define IDirectSoundCaptureBuffer_Stop(p) (p)->Stop()
-+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSoundCaptureBuffer8
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundCaptureBuffer8, 0x990df4, 0xdbb, 0x4872, 0x83, 0x3e, 0x6d, 0x30, 0x3e, 0x80, 0xae, 0xb6);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundCaptureBuffer8
-+
-+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer8, IDirectSoundCaptureBuffer)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundCaptureBuffer methods
-+ STDMETHOD(GetCaps) (THIS_ LPDSCBCAPS pDSCBCaps) PURE;
-+ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE;
-+ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
-+ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE;
-+ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE;
-+ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
-+ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
-+ STDMETHOD(Start) (THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(Stop) (THIS) PURE;
-+ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
-+
-+ // IDirectSoundCaptureBuffer8 methods
-+ STDMETHOD(GetObjectInPath) (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
-+ STDMETHOD(GetFXStatus) (DWORD dwFXCount, LPDWORD pdwFXStatus) PURE;
-+};
-+
-+#define IDirectSoundCaptureBuffer8_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundCaptureBuffer8_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundCaptureBuffer8_Release(p) IUnknown_Release(p)
-+
-+#define IDirectSoundCaptureBuffer8_GetCaps(p,a) IDirectSoundCaptureBuffer_GetCaps(p,a)
-+#define IDirectSoundCaptureBuffer8_GetCurrentPosition(p,a,b) IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b)
-+#define IDirectSoundCaptureBuffer8_GetFormat(p,a,b,c) IDirectSoundCaptureBuffer_GetFormat(p,a,b,c)
-+#define IDirectSoundCaptureBuffer8_GetStatus(p,a) IDirectSoundCaptureBuffer_GetStatus(p,a)
-+#define IDirectSoundCaptureBuffer8_Initialize(p,a,b) IDirectSoundCaptureBuffer_Initialize(p,a,b)
-+#define IDirectSoundCaptureBuffer8_Lock(p,a,b,c,d,e,f,g) IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g)
-+#define IDirectSoundCaptureBuffer8_Start(p,a) IDirectSoundCaptureBuffer_Start(p,a)
-+#define IDirectSoundCaptureBuffer8_Stop(p) IDirectSoundCaptureBuffer_Stop(p))
-+#define IDirectSoundCaptureBuffer8_Unlock(p,a,b,c,d) IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
-+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->lpVtbl->GetFXStatus(p,a,b)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d)
-+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->GetFXStatus(a,b)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSoundNotify
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundNotify
-+
-+DECLARE_INTERFACE_(IDirectSoundNotify, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundNotify methods
-+ STDMETHOD(SetNotificationPositions) (THIS_ DWORD dwPositionNotifies, LPCDSBPOSITIONNOTIFY pcPositionNotifies) PURE;
-+};
-+
-+#define IDirectSoundNotify_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundNotify_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundNotify_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->lpVtbl->SetNotificationPositions(p,a,b)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->SetNotificationPositions(a,b)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IKsPropertySet
-+//
-+
-+#ifndef _IKsPropertySet_
-+#define _IKsPropertySet_
-+
-+#ifdef __cplusplus
-+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
-+struct IKsPropertySet;
-+#endif // __cplusplus
-+
-+typedef struct IKsPropertySet *LPKSPROPERTYSET;
-+
-+#define KSPROPERTY_SUPPORT_GET 0x00000001
-+#define KSPROPERTY_SUPPORT_SET 0x00000002
-+
-+DEFINE_GUID(IID_IKsPropertySet, 0x31efac30, 0x515c, 0x11d0, 0xa9, 0xaa, 0x00, 0xaa, 0x00, 0x61, 0xbe, 0x93);
-+
-+#undef INTERFACE
-+#define INTERFACE IKsPropertySet
-+
-+DECLARE_INTERFACE_(IKsPropertySet, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IKsPropertySet methods
-+ STDMETHOD(Get) (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength,
-+ LPVOID pPropertyData, ULONG ulDataLength, PULONG pulBytesReturned) PURE;
-+ STDMETHOD(Set) (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength,
-+ LPVOID pPropertyData, ULONG ulDataLength) PURE;
-+ STDMETHOD(QuerySupport) (THIS_ REFGUID rguidPropSet, ULONG ulId, PULONG pulTypeSupport) PURE;
-+};
-+
-+#define IKsPropertySet_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IKsPropertySet_AddRef(p) IUnknown_AddRef(p)
-+#define IKsPropertySet_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->lpVtbl->Get(p,a,b,c,d,e,f,g)
-+#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->lpVtbl->Set(p,a,b,c,d,e,f)
-+#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->lpVtbl->QuerySupport(p,a,b,c)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->Get(a,b,c,d,e,f,g)
-+#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->Set(a,b,c,d,e,f)
-+#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->QuerySupport(a,b,c)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // _IKsPropertySet_
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// IDirectSoundFXGargle
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352, 0xd622, 0x11ce, 0xaa, 0xc5, 0x00, 0x20, 0xaf, 0x0b, 0x99, 0xa3);
-+
-+typedef struct _DSFXGargle
-+{
-+ DWORD dwRateHz; // Rate of modulation in hz
-+ DWORD dwWaveShape; // DSFXGARGLE_WAVE_xxx
-+} DSFXGargle, *LPDSFXGargle;
-+
-+#define DSFXGARGLE_WAVE_TRIANGLE 0
-+#define DSFXGARGLE_WAVE_SQUARE 1
-+
-+typedef const DSFXGargle *LPCDSFXGargle;
-+
-+#define DSFXGARGLE_RATEHZ_MIN 1
-+#define DSFXGARGLE_RATEHZ_MAX 1000
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXGargle
-+
-+DECLARE_INTERFACE_(IDirectSoundFXGargle, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXGargle methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXGargle pcDsFxGargle) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXGargle pDsFxGargle) PURE;
-+};
-+
-+#define IDirectSoundFXGargle_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXGargle_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXGargle_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXChorus
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3, 0x145f, 0x43e6, 0xa9, 0x34, 0xa7, 0x18, 0x06, 0xe5, 0x05, 0x47);
-+
-+typedef struct _DSFXChorus
-+{
-+ FLOAT fWetDryMix;
-+ FLOAT fDepth;
-+ FLOAT fFeedback;
-+ FLOAT fFrequency;
-+ LONG lWaveform; // LFO shape; DSFXCHORUS_WAVE_xxx
-+ FLOAT fDelay;
-+ LONG lPhase;
-+} DSFXChorus, *LPDSFXChorus;
-+
-+typedef const DSFXChorus *LPCDSFXChorus;
-+
-+#define DSFXCHORUS_WAVE_TRIANGLE 0
-+#define DSFXCHORUS_WAVE_SIN 1
-+
-+#define DSFXCHORUS_WETDRYMIX_MIN 0.0f
-+#define DSFXCHORUS_WETDRYMIX_MAX 100.0f
-+#define DSFXCHORUS_DEPTH_MIN 0.0f
-+#define DSFXCHORUS_DEPTH_MAX 100.0f
-+#define DSFXCHORUS_FEEDBACK_MIN -99.0f
-+#define DSFXCHORUS_FEEDBACK_MAX 99.0f
-+#define DSFXCHORUS_FREQUENCY_MIN 0.0f
-+#define DSFXCHORUS_FREQUENCY_MAX 10.0f
-+#define DSFXCHORUS_DELAY_MIN 0.0f
-+#define DSFXCHORUS_DELAY_MAX 20.0f
-+#define DSFXCHORUS_PHASE_MIN 0
-+#define DSFXCHORUS_PHASE_MAX 4
-+
-+#define DSFXCHORUS_PHASE_NEG_180 0
-+#define DSFXCHORUS_PHASE_NEG_90 1
-+#define DSFXCHORUS_PHASE_ZERO 2
-+#define DSFXCHORUS_PHASE_90 3
-+#define DSFXCHORUS_PHASE_180 4
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXChorus
-+
-+DECLARE_INTERFACE_(IDirectSoundFXChorus, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXChorus methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXChorus pcDsFxChorus) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXChorus pDsFxChorus) PURE;
-+};
-+
-+#define IDirectSoundFXChorus_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXChorus_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXChorus_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXFlanger
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878, 0x2c92, 0x4072, 0x9b, 0x2c, 0xea, 0x68, 0xf5, 0x39, 0x67, 0x83);
-+
-+typedef struct _DSFXFlanger
-+{
-+ FLOAT fWetDryMix;
-+ FLOAT fDepth;
-+ FLOAT fFeedback;
-+ FLOAT fFrequency;
-+ LONG lWaveform;
-+ FLOAT fDelay;
-+ LONG lPhase;
-+} DSFXFlanger, *LPDSFXFlanger;
-+
-+typedef const DSFXFlanger *LPCDSFXFlanger;
-+
-+#define DSFXFLANGER_WAVE_TRIANGLE 0
-+#define DSFXFLANGER_WAVE_SIN 1
-+
-+#define DSFXFLANGER_WETDRYMIX_MIN 0.0f
-+#define DSFXFLANGER_WETDRYMIX_MAX 100.0f
-+#define DSFXFLANGER_FREQUENCY_MIN 0.0f
-+#define DSFXFLANGER_FREQUENCY_MAX 10.0f
-+#define DSFXFLANGER_DEPTH_MIN 0.0f
-+#define DSFXFLANGER_DEPTH_MAX 100.0f
-+#define DSFXFLANGER_PHASE_MIN 0
-+#define DSFXFLANGER_PHASE_MAX 4
-+#define DSFXFLANGER_FEEDBACK_MIN -99.0f
-+#define DSFXFLANGER_FEEDBACK_MAX 99.0f
-+#define DSFXFLANGER_DELAY_MIN 0.0f
-+#define DSFXFLANGER_DELAY_MAX 4.0f
-+
-+#define DSFXFLANGER_PHASE_NEG_180 0
-+#define DSFXFLANGER_PHASE_NEG_90 1
-+#define DSFXFLANGER_PHASE_ZERO 2
-+#define DSFXFLANGER_PHASE_90 3
-+#define DSFXFLANGER_PHASE_180 4
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXFlanger
-+
-+DECLARE_INTERFACE_(IDirectSoundFXFlanger, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXFlanger methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXFlanger pcDsFxFlanger) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXFlanger pDsFxFlanger) PURE;
-+};
-+
-+#define IDirectSoundFXFlanger_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXFlanger_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXFlanger_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXEcho
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf, 0x50db, 0x4e92, 0xa2, 0xbd, 0x44, 0x54, 0x88, 0xd1, 0xed, 0x42);
-+
-+typedef struct _DSFXEcho
-+{
-+ FLOAT fWetDryMix;
-+ FLOAT fFeedback;
-+ FLOAT fLeftDelay;
-+ FLOAT fRightDelay;
-+ LONG lPanDelay;
-+} DSFXEcho, *LPDSFXEcho;
-+
-+typedef const DSFXEcho *LPCDSFXEcho;
-+
-+#define DSFXECHO_WETDRYMIX_MIN 0.0f
-+#define DSFXECHO_WETDRYMIX_MAX 100.0f
-+#define DSFXECHO_FEEDBACK_MIN 0.0f
-+#define DSFXECHO_FEEDBACK_MAX 100.0f
-+#define DSFXECHO_LEFTDELAY_MIN 1.0f
-+#define DSFXECHO_LEFTDELAY_MAX 2000.0f
-+#define DSFXECHO_RIGHTDELAY_MIN 1.0f
-+#define DSFXECHO_RIGHTDELAY_MAX 2000.0f
-+#define DSFXECHO_PANDELAY_MIN 0
-+#define DSFXECHO_PANDELAY_MAX 1
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXEcho
-+
-+DECLARE_INTERFACE_(IDirectSoundFXEcho, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXEcho methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXEcho pcDsFxEcho) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXEcho pDsFxEcho) PURE;
-+};
-+
-+#define IDirectSoundFXEcho_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXEcho_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXEcho_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXDistortion
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326, 0x455f, 0x4d8b, 0xbd, 0xa9, 0x8d, 0x5d, 0x3e, 0x9e, 0x3e, 0x0b);
-+
-+typedef struct _DSFXDistortion
-+{
-+ FLOAT fGain;
-+ FLOAT fEdge;
-+ FLOAT fPostEQCenterFrequency;
-+ FLOAT fPostEQBandwidth;
-+ FLOAT fPreLowpassCutoff;
-+} DSFXDistortion, *LPDSFXDistortion;
-+
-+typedef const DSFXDistortion *LPCDSFXDistortion;
-+
-+#define DSFXDISTORTION_GAIN_MIN -60.0f
-+#define DSFXDISTORTION_GAIN_MAX 0.0f
-+#define DSFXDISTORTION_EDGE_MIN 0.0f
-+#define DSFXDISTORTION_EDGE_MAX 100.0f
-+#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MIN 100.0f
-+#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MAX 8000.0f
-+#define DSFXDISTORTION_POSTEQBANDWIDTH_MIN 100.0f
-+#define DSFXDISTORTION_POSTEQBANDWIDTH_MAX 8000.0f
-+#define DSFXDISTORTION_PRELOWPASSCUTOFF_MIN 100.0f
-+#define DSFXDISTORTION_PRELOWPASSCUTOFF_MAX 8000.0f
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXDistortion
-+
-+DECLARE_INTERFACE_(IDirectSoundFXDistortion, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXDistortion methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXDistortion pcDsFxDistortion) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXDistortion pDsFxDistortion) PURE;
-+};
-+
-+#define IDirectSoundFXDistortion_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXDistortion_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXDistortion_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXCompressor
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154, 0x62f6, 0x4e2c, 0xa1, 0x5c, 0xd3, 0xb6, 0xc4, 0x17, 0xf7, 0xa0);
-+
-+typedef struct _DSFXCompressor
-+{
-+ FLOAT fGain;
-+ FLOAT fAttack;
-+ FLOAT fRelease;
-+ FLOAT fThreshold;
-+ FLOAT fRatio;
-+ FLOAT fPredelay;
-+} DSFXCompressor, *LPDSFXCompressor;
-+
-+typedef const DSFXCompressor *LPCDSFXCompressor;
-+
-+#define DSFXCOMPRESSOR_GAIN_MIN -60.0f
-+#define DSFXCOMPRESSOR_GAIN_MAX 60.0f
-+#define DSFXCOMPRESSOR_ATTACK_MIN 0.01f
-+#define DSFXCOMPRESSOR_ATTACK_MAX 500.0f
-+#define DSFXCOMPRESSOR_RELEASE_MIN 50.0f
-+#define DSFXCOMPRESSOR_RELEASE_MAX 3000.0f
-+#define DSFXCOMPRESSOR_THRESHOLD_MIN -60.0f
-+#define DSFXCOMPRESSOR_THRESHOLD_MAX 0.0f
-+#define DSFXCOMPRESSOR_RATIO_MIN 1.0f
-+#define DSFXCOMPRESSOR_RATIO_MAX 100.0f
-+#define DSFXCOMPRESSOR_PREDELAY_MIN 0.0f
-+#define DSFXCOMPRESSOR_PREDELAY_MAX 4.0f
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXCompressor
-+
-+DECLARE_INTERFACE_(IDirectSoundFXCompressor, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXCompressor methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXCompressor pcDsFxCompressor) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXCompressor pDsFxCompressor) PURE;
-+};
-+
-+#define IDirectSoundFXCompressor_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXCompressor_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXCompressor_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundFXParamEq
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe, 0xfe90, 0x4204, 0x80, 0x78, 0x82, 0x33, 0x4c, 0xd1, 0x77, 0xda);
-+
-+typedef struct _DSFXParamEq
-+{
-+ FLOAT fCenter;
-+ FLOAT fBandwidth;
-+ FLOAT fGain;
-+} DSFXParamEq, *LPDSFXParamEq;
-+
-+typedef const DSFXParamEq *LPCDSFXParamEq;
-+
-+#define DSFXPARAMEQ_CENTER_MIN 80.0f
-+#define DSFXPARAMEQ_CENTER_MAX 16000.0f
-+#define DSFXPARAMEQ_BANDWIDTH_MIN 1.0f
-+#define DSFXPARAMEQ_BANDWIDTH_MAX 36.0f
-+#define DSFXPARAMEQ_GAIN_MIN -15.0f
-+#define DSFXPARAMEQ_GAIN_MAX 15.0f
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXParamEq
-+
-+DECLARE_INTERFACE_(IDirectSoundFXParamEq, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXParamEq methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXParamEq pcDsFxParamEq) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXParamEq pDsFxParamEq) PURE;
-+};
-+
-+#define IDirectSoundFXParamEq_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXParamEq_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXParamEq_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+
-+//
-+// IDirectSoundFXI3DL2Reverb
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4);
-+
-+typedef struct _DSFXI3DL2Reverb
-+{
-+ LONG lRoom; // [-10000, 0] default: -1000 mB
-+ LONG lRoomHF; // [-10000, 0] default: 0 mB
-+ FLOAT flRoomRolloffFactor; // [0.0, 10.0] default: 0.0
-+ FLOAT flDecayTime; // [0.1, 20.0] default: 1.49s
-+ FLOAT flDecayHFRatio; // [0.1, 2.0] default: 0.83
-+ LONG lReflections; // [-10000, 1000] default: -2602 mB
-+ FLOAT flReflectionsDelay; // [0.0, 0.3] default: 0.007 s
-+ LONG lReverb; // [-10000, 2000] default: 200 mB
-+ FLOAT flReverbDelay; // [0.0, 0.1] default: 0.011 s
-+ FLOAT flDiffusion; // [0.0, 100.0] default: 100.0 %
-+ FLOAT flDensity; // [0.0, 100.0] default: 100.0 %
-+ FLOAT flHFReference; // [20.0, 20000.0] default: 5000.0 Hz
-+} DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb;
-+
-+typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb;
-+
-+#define DSFX_I3DL2REVERB_ROOM_MIN (-10000)
-+#define DSFX_I3DL2REVERB_ROOM_MAX 0
-+#define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000)
-+
-+#define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000)
-+#define DSFX_I3DL2REVERB_ROOMHF_MAX 0
-+#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT (-100)
-+
-+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f
-+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f
-+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f
-+
-+#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f
-+#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f
-+#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f
-+
-+#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f
-+#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f
-+#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f
-+
-+#define DSFX_I3DL2REVERB_REFLECTIONS_MIN (-10000)
-+#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000
-+#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT (-2602)
-+
-+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f
-+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f
-+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f
-+
-+#define DSFX_I3DL2REVERB_REVERB_MIN (-10000)
-+#define DSFX_I3DL2REVERB_REVERB_MAX 2000
-+#define DSFX_I3DL2REVERB_REVERB_DEFAULT (200)
-+
-+#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f
-+#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f
-+#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f
-+
-+#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f
-+#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f
-+#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f
-+
-+#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f
-+#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f
-+#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f
-+
-+#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f
-+#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f
-+#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f
-+
-+#define DSFX_I3DL2REVERB_QUALITY_MIN 0
-+#define DSFX_I3DL2REVERB_QUALITY_MAX 3
-+#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXI3DL2Reverb
-+
-+DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXI3DL2Reverb methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXI3DL2Reverb pcDsFxI3DL2Reverb) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXI3DL2Reverb pDsFxI3DL2Reverb) PURE;
-+ STDMETHOD(SetPreset) (THIS_ DWORD dwPreset) PURE;
-+ STDMETHOD(GetPreset) (THIS_ LPDWORD pdwPreset) PURE;
-+ STDMETHOD(SetQuality) (THIS_ LONG lQuality) PURE;
-+ STDMETHOD(GetQuality) (THIS_ LONG *plQuality) PURE;
-+};
-+
-+#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXI3DL2Reverb_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXI3DL2Reverb_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->lpVtbl->SetPreset(p,a)
-+#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->lpVtbl->GetPreset(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->SetPreset(a)
-+#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->GetPreset(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+
-+//
-+// IDirectSoundFXWavesReverb
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundFXWavesReverb,0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25);
-+
-+typedef struct _DSFXWavesReverb
-+{
-+ FLOAT fInGain; // [-96.0,0.0] default: 0.0 dB
-+ FLOAT fReverbMix; // [-96.0,0.0] default: 0.0 db
-+ FLOAT fReverbTime; // [0.001,3000.0] default: 1000.0 ms
-+ FLOAT fHighFreqRTRatio; // [0.001,0.999] default: 0.001
-+} DSFXWavesReverb, *LPDSFXWavesReverb;
-+
-+typedef const DSFXWavesReverb *LPCDSFXWavesReverb;
-+
-+#define DSFX_WAVESREVERB_INGAIN_MIN -96.0f
-+#define DSFX_WAVESREVERB_INGAIN_MAX 0.0f
-+#define DSFX_WAVESREVERB_INGAIN_DEFAULT 0.0f
-+#define DSFX_WAVESREVERB_REVERBMIX_MIN -96.0f
-+#define DSFX_WAVESREVERB_REVERBMIX_MAX 0.0f
-+#define DSFX_WAVESREVERB_REVERBMIX_DEFAULT 0.0f
-+#define DSFX_WAVESREVERB_REVERBTIME_MIN 0.001f
-+#define DSFX_WAVESREVERB_REVERBTIME_MAX 3000.0f
-+#define DSFX_WAVESREVERB_REVERBTIME_DEFAULT 1000.0f
-+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MIN 0.001f
-+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MAX 0.999f
-+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_DEFAULT 0.001f
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFXWavesReverb
-+
-+DECLARE_INTERFACE_(IDirectSoundFXWavesReverb, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFXWavesReverb methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXWavesReverb pcDsFxWavesReverb) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSFXWavesReverb pDsFxWavesReverb) PURE;
-+};
-+
-+#define IDirectSoundFXWavesReverb_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFXWavesReverb_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFXWavesReverb_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+//
-+// IDirectSoundCaptureFXAec
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundCaptureFXAec, 0x174d3eb9, 0x6696, 0x4fac, 0xa4, 0x6c, 0xa0, 0xac, 0x7b, 0xc9, 0xe2, 0xf);
-+
-+typedef struct _DSCFXAec
-+{
-+ BOOL fEnable;
-+ BOOL fReset;
-+} DSCFXAec, *LPDSCFXAec;
-+
-+typedef const DSCFXAec *LPCDSCFXAec;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundCaptureFXAec
-+
-+DECLARE_INTERFACE_(IDirectSoundCaptureFXAec, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundCaptureFXAec methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSCFXAec pDscFxAec) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSCFXAec pDscFxAec) PURE;
-+};
-+
-+#define IDirectSoundCaptureFXAec_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundCaptureFXAec_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundCaptureFXAec_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureFXAec_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundCaptureFXAec_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureFXAec_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundCaptureFXAec_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+
-+//
-+// IDirectSoundCaptureFXNoiseSuppress
-+//
-+
-+DEFINE_GUID(IID_IDirectSoundCaptureFXNoiseSuppress, 0xed311e41, 0xfbae, 0x4175, 0x96, 0x25, 0xcd, 0x8, 0x54, 0xf6, 0x93, 0xca);
-+
-+typedef struct _DSCFXNoiseSuppress
-+{
-+ BOOL fEnable;
-+ BOOL fReset;
-+} DSCFXNoiseSuppress, *LPDSCFXNoiseSuppress;
-+
-+typedef const DSCFXNoiseSuppress *LPCDSCFXNoiseSuppress;
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundCaptureFXNoiseSuppress
-+
-+DECLARE_INTERFACE_(IDirectSoundCaptureFXNoiseSuppress, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundCaptureFXNoiseSuppress methods
-+ STDMETHOD(SetAllParameters) (THIS_ LPCDSCFXNoiseSuppress pcDscFxNoiseSuppress) PURE;
-+ STDMETHOD(GetAllParameters) (THIS_ LPDSCFXNoiseSuppress pDscFxNoiseSuppress) PURE;
-+};
-+
-+#define IDirectSoundCaptureFXNoiseSuppress_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundCaptureFXNoiseSuppress_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundCaptureFXNoiseSuppress_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a)
-+#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a) (p)->SetAllParameters(a)
-+#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a) (p)->GetAllParameters(a)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+
-+//
-+// IDirectSoundFullDuplex
-+//
-+
-+#ifndef _IDirectSoundFullDuplex_
-+#define _IDirectSoundFullDuplex_
-+
-+#ifdef __cplusplus
-+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
-+struct IDirectSoundFullDuplex;
-+#endif // __cplusplus
-+
-+typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX;
-+
-+DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xedcb4c7a, 0xdaab, 0x4216, 0xa4, 0x2e, 0x6c, 0x50, 0x59, 0x6d, 0xdc, 0x1d);
-+
-+#undef INTERFACE
-+#define INTERFACE IDirectSoundFullDuplex
-+
-+DECLARE_INTERFACE_(IDirectSoundFullDuplex, IUnknown)
-+{
-+ // IUnknown methods
-+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-+ STDMETHOD_(ULONG,Release) (THIS) PURE;
-+
-+ // IDirectSoundFullDuplex methods
-+ STDMETHOD(Initialize) (THIS_ LPCGUID pCaptureGuid, LPCGUID pRenderGuid, LPCDSCBUFFERDESC lpDscBufferDesc, LPCDSBUFFERDESC lpDsBufferDesc, HWND hWnd, DWORD dwLevel, LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8, LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8) PURE;
-+};
-+
-+#define IDirectSoundFullDuplex_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b)
-+#define IDirectSoundFullDuplex_AddRef(p) IUnknown_AddRef(p)
-+#define IDirectSoundFullDuplex_Release(p) IUnknown_Release(p)
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Initialize(p,a,b,c,d,e,f,g,h)
-+#else // !defined(__cplusplus) || defined(CINTERFACE)
-+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->Initialize(a,b,c,d,e,f,g,h)
-+#endif // !defined(__cplusplus) || defined(CINTERFACE)
-+
-+#endif // _IDirectSoundFullDuplex_
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// Return Codes
-+//
-+
-+// The function completed successfully
-+#define DS_OK S_OK
-+
-+// The call succeeded, but we had to substitute the 3D algorithm
-+#define DS_NO_VIRTUALIZATION MAKE_HRESULT(0, _FACDS, 10)
-+
-+// The call succeeded, but not all of the optional effects were obtained.
-+#define DS_INCOMPLETE MAKE_HRESULT(0, _FACDS, 20)
-+
-+// The call failed because resources (such as a priority level)
-+// were already being used by another caller
-+#define DSERR_ALLOCATED MAKE_DSHRESULT(10)
-+
-+// The control (vol, pan, etc.) requested by the caller is not available
-+#define DSERR_CONTROLUNAVAIL MAKE_DSHRESULT(30)
-+
-+// An invalid parameter was passed to the returning function
-+#define DSERR_INVALIDPARAM E_INVALIDARG
-+
-+// This call is not valid for the current state of this object
-+#define DSERR_INVALIDCALL MAKE_DSHRESULT(50)
-+
-+// An undetermined error occurred inside the DirectSound subsystem
-+#define DSERR_GENERIC E_FAIL
-+
-+// The caller does not have the priority level required for the function to
-+// succeed
-+#define DSERR_PRIOLEVELNEEDED MAKE_DSHRESULT(70)
-+
-+// Not enough free memory is available to complete the operation
-+#define DSERR_OUTOFMEMORY E_OUTOFMEMORY
-+
-+// The specified WAVE format is not supported
-+#define DSERR_BADFORMAT MAKE_DSHRESULT(100)
-+
-+// The function called is not supported at this time
-+#define DSERR_UNSUPPORTED E_NOTIMPL
-+
-+// No sound driver is available for use
-+#define DSERR_NODRIVER MAKE_DSHRESULT(120)
-+
-+// This object is already initialized
-+#define DSERR_ALREADYINITIALIZED MAKE_DSHRESULT(130)
-+
-+// This object does not support aggregation
-+#define DSERR_NOAGGREGATION CLASS_E_NOAGGREGATION
-+
-+// The buffer memory has been lost, and must be restored
-+#define DSERR_BUFFERLOST MAKE_DSHRESULT(150)
-+
-+// Another app has a higher priority level, preventing this call from
-+// succeeding
-+#define DSERR_OTHERAPPHASPRIO MAKE_DSHRESULT(160)
-+
-+// This object has not been initialized
-+#define DSERR_UNINITIALIZED MAKE_DSHRESULT(170)
-+
-+// The requested COM interface is not available
-+#define DSERR_NOINTERFACE E_NOINTERFACE
-+
-+// Access is denied
-+#define DSERR_ACCESSDENIED E_ACCESSDENIED
-+
-+// Tried to create a DSBCAPS_CTRLFX buffer shorter than DSBSIZE_FX_MIN milliseconds
-+#define DSERR_BUFFERTOOSMALL MAKE_DSHRESULT(180)
-+
-+// Attempt to use DirectSound 8 functionality on an older DirectSound object
-+#define DSERR_DS8_REQUIRED MAKE_DSHRESULT(190)
-+
-+// A circular loop of send effects was detected
-+#define DSERR_SENDLOOP MAKE_DSHRESULT(200)
-+
-+// The GUID specified in an audiopath file does not match a valid MIXIN buffer
-+#define DSERR_BADSENDBUFFERGUID MAKE_DSHRESULT(210)
-+
-+// The object requested was not found (numerically equal to DMUS_E_NOT_FOUND)
-+#define DSERR_OBJECTNOTFOUND MAKE_DSHRESULT(4449)
-+
-+//
-+// Flags
-+//
-+
-+#define DSCAPS_PRIMARYMONO 0x00000001
-+#define DSCAPS_PRIMARYSTEREO 0x00000002
-+#define DSCAPS_PRIMARY8BIT 0x00000004
-+#define DSCAPS_PRIMARY16BIT 0x00000008
-+#define DSCAPS_CONTINUOUSRATE 0x00000010
-+#define DSCAPS_EMULDRIVER 0x00000020
-+#define DSCAPS_CERTIFIED 0x00000040
-+#define DSCAPS_SECONDARYMONO 0x00000100
-+#define DSCAPS_SECONDARYSTEREO 0x00000200
-+#define DSCAPS_SECONDARY8BIT 0x00000400
-+#define DSCAPS_SECONDARY16BIT 0x00000800
-+
-+#define DSSCL_NORMAL 0x00000001
-+#define DSSCL_PRIORITY 0x00000002
-+#define DSSCL_EXCLUSIVE 0x00000003
-+#define DSSCL_WRITEPRIMARY 0x00000004
-+
-+#define DSSPEAKER_HEADPHONE 0x00000001
-+#define DSSPEAKER_MONO 0x00000002
-+#define DSSPEAKER_QUAD 0x00000003
-+#define DSSPEAKER_STEREO 0x00000004
-+#define DSSPEAKER_SURROUND 0x00000005
-+#define DSSPEAKER_5POINT1 0x00000006
-+
-+#define DSSPEAKER_GEOMETRY_MIN 0x00000005 // 5 degrees
-+#define DSSPEAKER_GEOMETRY_NARROW 0x0000000A // 10 degrees
-+#define DSSPEAKER_GEOMETRY_WIDE 0x00000014 // 20 degrees
-+#define DSSPEAKER_GEOMETRY_MAX 0x000000B4 // 180 degrees
-+
-+#define DSSPEAKER_COMBINED(c, g) ((DWORD)(((BYTE)(c)) | ((DWORD)((BYTE)(g))) << 16))
-+#define DSSPEAKER_CONFIG(a) ((BYTE)(a))
-+#define DSSPEAKER_GEOMETRY(a) ((BYTE)(((DWORD)(a) >> 16) & 0x00FF))
-+
-+#define DSBCAPS_PRIMARYBUFFER 0x00000001
-+#define DSBCAPS_STATIC 0x00000002
-+#define DSBCAPS_LOCHARDWARE 0x00000004
-+#define DSBCAPS_LOCSOFTWARE 0x00000008
-+#define DSBCAPS_CTRL3D 0x00000010
-+#define DSBCAPS_CTRLFREQUENCY 0x00000020
-+#define DSBCAPS_CTRLPAN 0x00000040
-+#define DSBCAPS_CTRLVOLUME 0x00000080
-+#define DSBCAPS_CTRLPOSITIONNOTIFY 0x00000100
-+#define DSBCAPS_CTRLFX 0x00000200
-+#define DSBCAPS_STICKYFOCUS 0x00004000
-+#define DSBCAPS_GLOBALFOCUS 0x00008000
-+#define DSBCAPS_GETCURRENTPOSITION2 0x00010000
-+#define DSBCAPS_MUTE3DATMAXDISTANCE 0x00020000
-+#define DSBCAPS_LOCDEFER 0x00040000
-+
-+#define DSBPLAY_LOOPING 0x00000001
-+#define DSBPLAY_LOCHARDWARE 0x00000002
-+#define DSBPLAY_LOCSOFTWARE 0x00000004
-+#define DSBPLAY_TERMINATEBY_TIME 0x00000008
-+#define DSBPLAY_TERMINATEBY_DISTANCE 0x000000010
-+#define DSBPLAY_TERMINATEBY_PRIORITY 0x000000020
-+
-+#define DSBSTATUS_PLAYING 0x00000001
-+#define DSBSTATUS_BUFFERLOST 0x00000002
-+#define DSBSTATUS_LOOPING 0x00000004
-+#define DSBSTATUS_LOCHARDWARE 0x00000008
-+#define DSBSTATUS_LOCSOFTWARE 0x00000010
-+#define DSBSTATUS_TERMINATED 0x00000020
-+
-+#define DSBLOCK_FROMWRITECURSOR 0x00000001
-+#define DSBLOCK_ENTIREBUFFER 0x00000002
-+
-+#define DSBFREQUENCY_MIN 100
-+#define DSBFREQUENCY_MAX 100000
-+#define DSBFREQUENCY_ORIGINAL 0
-+
-+#define DSBPAN_LEFT -10000
-+#define DSBPAN_CENTER 0
-+#define DSBPAN_RIGHT 10000
-+
-+#define DSBVOLUME_MIN -10000
-+#define DSBVOLUME_MAX 0
-+
-+#define DSBSIZE_MIN 4
-+#define DSBSIZE_MAX 0x0FFFFFFF
-+#define DSBSIZE_FX_MIN 150 // NOTE: Milliseconds, not bytes
-+
-+#define DS3DMODE_NORMAL 0x00000000
-+#define DS3DMODE_HEADRELATIVE 0x00000001
-+#define DS3DMODE_DISABLE 0x00000002
-+
-+#define DS3D_IMMEDIATE 0x00000000
-+#define DS3D_DEFERRED 0x00000001
-+
-+#define DS3D_MINDISTANCEFACTOR FLT_MIN
-+#define DS3D_MAXDISTANCEFACTOR FLT_MAX
-+#define DS3D_DEFAULTDISTANCEFACTOR 1.0f
-+
-+#define DS3D_MINROLLOFFFACTOR 0.0f
-+#define DS3D_MAXROLLOFFFACTOR 10.0f
-+#define DS3D_DEFAULTROLLOFFFACTOR 1.0f
-+
-+#define DS3D_MINDOPPLERFACTOR 0.0f
-+#define DS3D_MAXDOPPLERFACTOR 10.0f
-+#define DS3D_DEFAULTDOPPLERFACTOR 1.0f
-+
-+#define DS3D_DEFAULTMINDISTANCE 1.0f
-+#define DS3D_DEFAULTMAXDISTANCE 1000000000.0f
-+
-+#define DS3D_MINCONEANGLE 0
-+#define DS3D_MAXCONEANGLE 360
-+#define DS3D_DEFAULTCONEANGLE 360
-+
-+#define DS3D_DEFAULTCONEOUTSIDEVOLUME DSBVOLUME_MAX
-+
-+// IDirectSoundCapture attributes
-+
-+#define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER
-+#define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED
-+
-+// IDirectSoundCaptureBuffer attributes
-+
-+#define DSCBCAPS_WAVEMAPPED 0x80000000
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+#define DSCBCAPS_CTRLFX 0x00000200
-+#endif
-+
-+
-+#define DSCBLOCK_ENTIREBUFFER 0x00000001
-+
-+#define DSCBSTATUS_CAPTURING 0x00000001
-+#define DSCBSTATUS_LOOPING 0x00000002
-+
-+#define DSCBSTART_LOOPING 0x00000001
-+
-+#define DSBPN_OFFSETSTOP 0xFFFFFFFF
-+
-+#define DS_CERTIFIED 0x00000000
-+#define DS_UNCERTIFIED 0x00000001
-+
-+// Dsound SYSTEM resource constants
-+// Matches the KSAUDIO_CPU_RESOURCES_xxx_HOST_CPU values defined
-+// in ksmedia.h.
-+#define DS_SYSTEM_RESOURCES_NO_HOST_RESOURCES 0x00000000
-+#define DS_SYSTEM_RESOURCES_ALL_HOST_RESOURCES 0x7FFFFFFF
-+#define DS_SYSTEM_RESOURCES_UNDEFINED 0x80000000
-+
-+
-+//
-+// I3DL2 Material Presets
-+//
-+
-+enum
-+{
-+ DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW,
-+ DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW,
-+ DSFX_I3DL2_MATERIAL_PRESET_THINDOOR,
-+ DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR,
-+ DSFX_I3DL2_MATERIAL_PRESET_WOODWALL,
-+ DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL,
-+ DSFX_I3DL2_MATERIAL_PRESET_STONEWALL,
-+ DSFX_I3DL2_MATERIAL_PRESET_CURTAIN
-+};
-+
-+#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW -2800,0.71f
-+#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW -5000,0.40f
-+#define I3DL2_MATERIAL_PRESET_THINDOOR -1800,0.66f
-+#define I3DL2_MATERIAL_PRESET_THICKDOOR -4400,0.64f
-+#define I3DL2_MATERIAL_PRESET_WOODWALL -4000,0.50f
-+#define I3DL2_MATERIAL_PRESET_BRICKWALL -5000,0.60f
-+#define I3DL2_MATERIAL_PRESET_STONEWALL -6000,0.68f
-+#define I3DL2_MATERIAL_PRESET_CURTAIN -1200,0.15f
-+
-+
-+enum
-+{
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_CITY,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL,
-+ DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE
-+};
-+
-+//
-+// I3DL2 Reverberation Presets Values
-+//
-+
-+#define I3DL2_ENVIRONMENT_PRESET_DEFAULT -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f, 200, 0.011f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_GENERIC -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f, 200, 0.011f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL -1000,-6000, 0.0f, 0.17f, 0.10f, -1204, 0.001f, 207, 0.002f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_ROOM -1000, -454, 0.0f, 0.40f, 0.83f, -1646, 0.002f, 53, 0.003f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_BATHROOM -1000,-1200, 0.0f, 1.49f, 0.54f, -370, 0.007f, 1030, 0.011f, 100.0f, 60.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM -1000,-6000, 0.0f, 0.50f, 0.10f, -1376, 0.003f, -1104, 0.004f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_STONEROOM -1000, -300, 0.0f, 2.31f, 0.64f, -711, 0.012f, 83, 0.017f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM -1000, -476, 0.0f, 4.32f, 0.59f, -789, 0.020f, -289, 0.030f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL -1000, -500, 0.0f, 3.92f, 0.70f, -1230, 0.020f, -2, 0.029f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_CAVE -1000, 0, 0.0f, 2.91f, 1.30f, -602, 0.015f, -302, 0.022f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_ARENA -1000, -698, 0.0f, 7.24f, 0.33f, -1166, 0.020f, 16, 0.030f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_HANGAR -1000,-1000, 0.0f,10.05f, 0.23f, -602, 0.020f, 198, 0.030f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000, 0.0f, 0.30f, 0.10f, -1831, 0.002f, -1630, 0.030f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_HALLWAY -1000, -300, 0.0f, 1.49f, 0.59f, -1219, 0.007f, 441, 0.011f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR -1000, -237, 0.0f, 2.70f, 0.79f, -1214, 0.013f, 395, 0.020f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_ALLEY -1000, -270, 0.0f, 1.49f, 0.86f, -1204, 0.007f, -4, 0.011f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_FOREST -1000,-3300, 0.0f, 1.49f, 0.54f, -2560, 0.162f, -613, 0.088f, 79.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_CITY -1000, -800, 0.0f, 1.49f, 0.67f, -2273, 0.007f, -2217, 0.011f, 50.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS -1000,-2500, 0.0f, 1.49f, 0.21f, -2780, 0.300f, -2014, 0.100f, 27.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_QUARRY -1000,-1000, 0.0f, 1.49f, 0.83f,-10000, 0.061f, 500, 0.025f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_PLAIN -1000,-2000, 0.0f, 1.49f, 0.50f, -2466, 0.179f, -2514, 0.100f, 21.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT -1000, 0, 0.0f, 1.65f, 1.50f, -1363, 0.008f, -1153, 0.012f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE -1000,-1000, 0.0f, 2.81f, 0.14f, 429, 0.014f, 648, 0.021f, 80.0f, 60.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER -1000,-4000, 0.0f, 1.49f, 0.10f, -449, 0.007f, 1700, 0.011f, 100.0f, 100.0f, 5000.0f
-+
-+//
-+// Examples simulating 'musical' reverb presets
-+//
-+// Name Decay time Description
-+// Small Room 1.1s A small size room with a length of 5m or so.
-+// Medium Room 1.3s A medium size room with a length of 10m or so.
-+// Large Room 1.5s A large size room suitable for live performances.
-+// Medium Hall 1.8s A medium size concert hall.
-+// Large Hall 1.8s A large size concert hall suitable for a full orchestra.
-+// Plate 1.3s A plate reverb simulation.
-+//
-+
-+#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM -1000, -600, 0.0f, 1.10f, 0.83f, -400, 0.005f, 500, 0.010f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM -1000, -600, 0.0f, 1.30f, 0.83f, -1000, 0.010f, -200, 0.020f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM -1000, -600, 0.0f, 1.50f, 0.83f, -1600, 0.020f, -1000, 0.040f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL -1000, -600, 0.0f, 1.80f, 0.70f, -1300, 0.015f, -800, 0.030f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL -1000, -600, 0.0f, 1.80f, 0.70f, -2000, 0.030f, -1400, 0.060f, 100.0f, 100.0f, 5000.0f
-+#define I3DL2_ENVIRONMENT_PRESET_PLATE -1000, -200, 0.0f, 1.30f, 0.90f, 0, 0.002f, 0, 0.010f, 100.0f, 75.0f, 5000.0f
-+
-+//
-+// DirectSound3D Algorithms
-+//
-+
-+// Default DirectSound3D algorithm {00000000-0000-0000-0000-000000000000}
-+#define DS3DALG_DEFAULT GUID_NULL
-+
-+// No virtualization (Pan3D) {C241333F-1C1B-11d2-94F5-00C04FC28ACA}
-+DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
-+
-+// High-quality HRTF algorithm {C2413340-1C1B-11d2-94F5-00C04FC28ACA}
-+DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
-+
-+// Lower-quality HRTF algorithm {C2413342-1C1B-11d2-94F5-00C04FC28ACA}
-+DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
-+
-+
-+#if DIRECTSOUND_VERSION >= 0x0800
-+
-+//
-+// DirectSound Internal Effect Algorithms
-+//
-+
-+
-+// Gargle {DAFD8210-5711-4B91-9FE3-F75B7AE279BF}
-+DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xdafd8210, 0x5711, 0x4b91, 0x9f, 0xe3, 0xf7, 0x5b, 0x7a, 0xe2, 0x79, 0xbf);
-+
-+// Chorus {EFE6629C-81F7-4281-BD91-C9D604A95AF6}
-+DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xefe6629c, 0x81f7, 0x4281, 0xbd, 0x91, 0xc9, 0xd6, 0x04, 0xa9, 0x5a, 0xf6);
-+
-+// Flanger {EFCA3D92-DFD8-4672-A603-7420894BAD98}
-+DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xefca3d92, 0xdfd8, 0x4672, 0xa6, 0x03, 0x74, 0x20, 0x89, 0x4b, 0xad, 0x98);
-+
-+// Echo/Delay {EF3E932C-D40B-4F51-8CCF-3F98F1B29D5D}
-+DEFINE_GUID(GUID_DSFX_STANDARD_ECHO, 0xef3e932c, 0xd40b, 0x4f51, 0x8c, 0xcf, 0x3f, 0x98, 0xf1, 0xb2, 0x9d, 0x5d);
-+
-+// Distortion {EF114C90-CD1D-484E-96E5-09CFAF912A21}
-+DEFINE_GUID(GUID_DSFX_STANDARD_DISTORTION, 0xef114c90, 0xcd1d, 0x484e, 0x96, 0xe5, 0x09, 0xcf, 0xaf, 0x91, 0x2a, 0x21);
-+
-+// Compressor/Limiter {EF011F79-4000-406D-87AF-BFFB3FC39D57}
-+DEFINE_GUID(GUID_DSFX_STANDARD_COMPRESSOR, 0xef011f79, 0x4000, 0x406d, 0x87, 0xaf, 0xbf, 0xfb, 0x3f, 0xc3, 0x9d, 0x57);
-+
-+// Parametric Equalization {120CED89-3BF4-4173-A132-3CB406CF3231}
-+DEFINE_GUID(GUID_DSFX_STANDARD_PARAMEQ, 0x120ced89, 0x3bf4, 0x4173, 0xa1, 0x32, 0x3c, 0xb4, 0x06, 0xcf, 0x32, 0x31);
-+
-+
-+// I3DL2 Environmental Reverberation: Reverb (Listener) Effect {EF985E71-D5C7-42D4-BA4D-2D073E2E96F4}
-+DEFINE_GUID(GUID_DSFX_STANDARD_I3DL2REVERB, 0xef985e71, 0xd5c7, 0x42d4, 0xba, 0x4d, 0x2d, 0x07, 0x3e, 0x2e, 0x96, 0xf4);
-+
-+// Waves Reverberation {87FC0268-9A55-4360-95AA-004A1D9DE26C}
-+DEFINE_GUID(GUID_DSFX_WAVES_REVERB, 0x87fc0268, 0x9a55, 0x4360, 0x95, 0xaa, 0x00, 0x4a, 0x1d, 0x9d, 0xe2, 0x6c);
-+
-+//
-+// DirectSound Capture Effect Algorithms
-+//
-+
-+
-+// Acoustic Echo Canceller {BF963D80-C559-11D0-8A2B-00A0C9255AC1}
-+// Matches KSNODETYPE_ACOUSTIC_ECHO_CANCEL in ksmedia.h
-+DEFINE_GUID(GUID_DSCFX_CLASS_AEC, 0xBF963D80L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1);
-+
-+// Microsoft AEC {CDEBB919-379A-488a-8765-F53CFD36DE40}
-+DEFINE_GUID(GUID_DSCFX_MS_AEC, 0xcdebb919, 0x379a, 0x488a, 0x87, 0x65, 0xf5, 0x3c, 0xfd, 0x36, 0xde, 0x40);
-+
-+// System AEC {1C22C56D-9879-4f5b-A389-27996DDC2810}
-+DEFINE_GUID(GUID_DSCFX_SYSTEM_AEC, 0x1c22c56d, 0x9879, 0x4f5b, 0xa3, 0x89, 0x27, 0x99, 0x6d, 0xdc, 0x28, 0x10);
-+
-+// Noise Supression {E07F903F-62FD-4e60-8CDD-DEA7236665B5}
-+// Matches KSNODETYPE_NOISE_SUPPRESS in post Windows ME DDK's ksmedia.h
-+DEFINE_GUID(GUID_DSCFX_CLASS_NS, 0xe07f903f, 0x62fd, 0x4e60, 0x8c, 0xdd, 0xde, 0xa7, 0x23, 0x66, 0x65, 0xb5);
-+
-+// Microsoft Noise Suppresion {11C5C73B-66E9-4ba1-A0BA-E814C6EED92D}
-+DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11c5c73b, 0x66e9, 0x4ba1, 0xa0, 0xba, 0xe8, 0x14, 0xc6, 0xee, 0xd9, 0x2d);
-+
-+// System Noise Suppresion {5AB0882E-7274-4516-877D-4EEE99BA4FD0}
-+DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5ab0882e, 0x7274, 0x4516, 0x87, 0x7d, 0x4e, 0xee, 0x99, 0xba, 0x4f, 0xd0);
-+
-+
-+#endif // DIRECTSOUND_VERSION >= 0x0800
-+
-+#endif // __DSOUND_INCLUDED__
-+
-+
-+
-+#ifdef __cplusplus
-+};
-+#endif // __cplusplus
-+
-+
diff --git a/src/w32api-2-directx-additions-for-qt.patch b/src/w32api-2-directx-additions-for-qt.patch
deleted file mode 100644
index e747c317..00000000
--- a/src/w32api-2-directx-additions-for-qt.patch
+++ /dev/null
@@ -1,3628 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch contains some DirectX additions for MinGW's w32api
-which were provided by the Qt project. It was generated via
-the following commands:
-
-#--------------------------------------------------------------------#
-wget -c 'http://kent.dl.sourceforge.net/project/mingw/MinGW API for MS-Windows/w32api-3.14/w32api-3.14-mingw32-dev.tar.gz'
-wget -c 'http://download.qt.nokia.com/misc/MinGW-gcc440_1.zip'
-wget -c 'http://websvn.kde.org/*checkout*/trunk/kdesupport/kdewin/include/directx/ddraw.h?revision=987475'
-mkdir a
-(cd a; tar -xf ../w32api-3.14-mingw32-dev.tar.gz include)
-cp -r a b
-unzip -j MinGW-gcc440_1.zip 'mingw/_patches/include.zip'
-unzip -aa -p include.zip '*.patch' | patch -d b/include -p1
-(cd b/include; unzip -aa ../../include.zip '*.h')
-# The ddraw.h we got from Qt is not enough to build SDL.
-# This one from Wine/KDE-Win works for both SDL and Qt
-# but we have to comment out some Wine-specific stuff.
-# Also, oddly enough, windef.h seems to use DUMMYUNIONNAME
-# instead of DUMMYUNIONNAME1 found in this ddraw.h. Use the
-# windef.h convention so SDL will build.
-cat 'ddraw.h?revision=987475' \
- | sed 's,.*WINELIB.*,/* & */,g;' \
- | sed 's,DUMMYUNIONNAME1\;,DUMMYUNIONNAME;,g;' \
- > b/include/ddraw.h
-diff -ruN a b > w32api-2-directx-additions-for-qt.patch
-rm -rf a b include.zip
-rm -f w32api-3.14-mingw32-dev.tar.gz MinGW-gcc440_1.zip 'ddraw.h?revision=987475'
-#--------------------------------------------------------------------#
-
-
-diff -ruN a/include/amvideo.h b/include/amvideo.h
---- a/include/amvideo.h 2009-11-21 06:31:42.000000000 +0100
-+++ b/include/amvideo.h 2010-04-25 20:35:52.184124176 +0200
-@@ -52,10 +52,10 @@
- BITMAPINFOHEADER bmiHeader;
- } VIDEOINFOHEADER;
- typedef struct tagVIDEOINFO {
-- RECT rcSource,
-- RECT rcTarget,
-- DWORD dwBitRate,
-- DWORD dwBitErrorRate,
-+ RECT rcSource;
-+ RECT rcTarget;
-+ DWORD dwBitRate;
-+ DWORD dwBitErrorRate;
- REFERENCE_TIME AvgTimePerFrame;
- BITMAPINFOHEADER bmiHeader;
- union {
-diff -ruN a/include/control.h b/include/control.h
---- a/include/control.h 2009-11-21 06:31:43.000000000 +0100
-+++ b/include/control.h 2010-04-25 20:35:52.184124176 +0200
-@@ -11,7 +11,63 @@
- /*--- DirectShow Reference - DirectShow Data Types */
- typedef LONG_PTR OAEVENT;
- typedef LONG_PTR OAHWND;
-+typedef LONG OAFilterState;
-
-+DEFINE_GUID(IID_IBasicAudio,0x56a868b3,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
-+DEFINE_GUID(IID_IMediaControl,0x56a868b1,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
-+DEFINE_GUID(IID_IMediaEvent,0x56a868b6,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
-+DEFINE_GUID(IID_IMediaPosition,0x56a868b2,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
-+
-+#define INTERFACE IMediaControl
-+DECLARE_INTERFACE_(IMediaControl, IDispatch)
-+{
-+ STDMETHOD(Run)(THIS) PURE;
-+ STDMETHOD(Pause)(THIS) PURE;
-+ STDMETHOD(Stop)(THIS) PURE;
-+ STDMETHOD(GetState)(THIS_ LONG, OAFilterState *) PURE;
-+ STDMETHOD(RenderFile)(THIS_ BSTR) PURE;
-+ STDMETHOD(AddSourceFilter)(THIS_ BSTR, IDispatch **) PURE;
-+ STDMETHOD(get_FilterCollection)(THIS_ IDispatch **) PURE;
-+ STDMETHOD(get_RegFilterCollection)(IDispatch **) PURE;
-+ STDMETHOD(StopWhenReady)(THIS) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IBasicAudio
-+DECLARE_INTERFACE_(IBasicAudio, IDispatch)
-+{
-+ STDMETHOD(put_Volume)(THIS_ long) PURE;
-+ STDMETHOD(get_Volume)(THIS_ long *) PURE;
-+ STDMETHOD(put_Balance)(THIS_ long) PURE;
-+ STDMETHOD(get_Balance)(THIS_ long *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaPosition
-+DECLARE_INTERFACE_(IMediaPosition, IDispatch)
-+{
-+ STDMETHOD(get_Duration)(THIS_ REFTIME *) PURE;
-+ STDMETHOD(put_CurrentPosition)(THIS_ REFTIME) PURE;
-+ STDMETHOD(get_CurrentPosition)(THIS_ REFTIME *) PURE;
-+ STDMETHOD(get_StopTime)(THIS_ REFTIME *) PURE;
-+ STDMETHOD(put_StopTime)(THIS_ REFTIME) PURE;
-+ STDMETHOD(get_PrerollTime)(THIS_ REFTIME *) PURE;
-+ STDMETHOD(put_PrerollTime)(THIS_ REFTIME) PURE;
-+ STDMETHOD(put_Rate)(THIS_ double) PURE;
-+ STDMETHOD(get_Rate)(THIS_ double *) PURE;
-+ STDMETHOD(CanSeekForward)(THIS_ LONG *) PURE;
-+ STDMETHOD(CanSeekBackward)(THIS_ LONG *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaEvent
-+DECLARE_INTERFACE_(IMediaEvent, IDispatch)
-+{
-+ STDMETHOD(GetEventHandle)(THIS_ OAEVENT *) PURE;
-+ STDMETHOD(GetEvent)(THIS_ long *, LONG_PTR *, LONG_PTR *, long) PURE;
-+ STDMETHOD(WaitForCompletion)(THIS_ long,long *) PURE;
-+ STDMETHOD(CancelDefaultHandling)(THIS_ long) PURE;
-+ STDMETHOD(RestoreDefaultHandling)(THIS_ long) PURE;
-+ STDMETHOD(FreeEventParams)(THIS_ long, LONG_PTR, LONG_PTR) PURE;
-+};
-+#undef INTERFACE
- #ifdef __cplusplus
- }
- #endif
-diff -ruN a/include/ddraw.h b/include/ddraw.h
---- a/include/ddraw.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/ddraw.h 2010-04-25 20:35:52.208133591 +0200
-@@ -0,0 +1,2681 @@
-+/*
-+ * Copyright (C) the Wine project
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#ifndef __WINE_DDRAW_H
-+#define __WINE_DDRAW_H
-+
-+#define COM_NO_WINDOWS_H
-+#include
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* defined(__cplusplus) */
-+
-+#ifndef DIRECTDRAW_VERSION
-+#define DIRECTDRAW_VERSION 0x0700
-+#endif /* DIRECTDRAW_VERSION */
-+
-+/*****************************************************************************
-+ * Predeclare the interfaces
-+ */
-+#ifndef __DDRAW_GUID_DEFINED__
-+DEFINE_GUID( CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
-+DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
-+DEFINE_GUID( CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 );
-+DEFINE_GUID( IID_IDirectDraw, 0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-+DEFINE_GUID( IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-+DEFINE_GUID( IID_IDirectDraw3, 0x618f8ad4,0x8b7a,0x11d0,0x8f,0xcc,0x0,0xc0,0x4f,0xd9,0x18,0x9d );
-+DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
-+DEFINE_GUID( IID_IDirectDraw7, 0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-+DEFINE_GUID( IID_IDirectDrawSurface, 0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-+DEFINE_GUID( IID_IDirectDrawSurface2, 0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 );
-+DEFINE_GUID( IID_IDirectDrawSurface3, 0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB );
-+DEFINE_GUID( IID_IDirectDrawSurface4, 0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B );
-+DEFINE_GUID( IID_IDirectDrawSurface7, 0x06675a80,0x3b9b,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-+DEFINE_GUID( IID_IDirectDrawPalette, 0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-+DEFINE_GUID( IID_IDirectDrawClipper, 0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-+DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
-+DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
-+#endif
-+
-+typedef struct IDirectDraw *LPDIRECTDRAW;
-+typedef struct IDirectDraw2 *LPDIRECTDRAW2;
-+typedef struct IDirectDraw3 *LPDIRECTDRAW3;
-+typedef struct IDirectDraw4 *LPDIRECTDRAW4;
-+typedef struct IDirectDraw7 *LPDIRECTDRAW7;
-+typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
-+typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
-+typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
-+typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
-+typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
-+typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
-+typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
-+typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
-+typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
-+
-+
-+#define DDENUMRET_CANCEL 0
-+#define DDENUMRET_OK 1
-+
-+#define DD_OK 0
-+
-+
-+#define _FACDD 0x876
-+#define MAKE_DDHRESULT( code ) MAKE_HRESULT( 1, _FACDD, code )
-+
-+#define DDERR_ALREADYINITIALIZED MAKE_DDHRESULT( 5 )
-+#define DDERR_CANNOTATTACHSURFACE MAKE_DDHRESULT( 10 )
-+#define DDERR_CANNOTDETACHSURFACE MAKE_DDHRESULT( 20 )
-+#define DDERR_CURRENTLYNOTAVAIL MAKE_DDHRESULT( 40 )
-+#define DDERR_EXCEPTION MAKE_DDHRESULT( 55 )
-+#define DDERR_GENERIC E_FAIL
-+#define DDERR_HEIGHTALIGN MAKE_DDHRESULT( 90 )
-+#define DDERR_INCOMPATIBLEPRIMARY MAKE_DDHRESULT( 95 )
-+#define DDERR_INVALIDCAPS MAKE_DDHRESULT( 100 )
-+#define DDERR_INVALIDCLIPLIST MAKE_DDHRESULT( 110 )
-+#define DDERR_INVALIDMODE MAKE_DDHRESULT( 120 )
-+#define DDERR_INVALIDOBJECT MAKE_DDHRESULT( 130 )
-+#define DDERR_INVALIDPARAMS E_INVALIDARG
-+#define DDERR_INVALIDPIXELFORMAT MAKE_DDHRESULT( 145 )
-+#define DDERR_INVALIDRECT MAKE_DDHRESULT( 150 )
-+#define DDERR_LOCKEDSURFACES MAKE_DDHRESULT( 160 )
-+#define DDERR_NO3D MAKE_DDHRESULT( 170 )
-+#define DDERR_NOALPHAHW MAKE_DDHRESULT( 180 )
-+#define DDERR_NOSTEREOHARDWARE MAKE_DDHRESULT( 181 )
-+#define DDERR_NOSURFACELEFT MAKE_DDHRESULT( 182 )
-+#define DDERR_NOCLIPLIST MAKE_DDHRESULT( 205 )
-+#define DDERR_NOCOLORCONVHW MAKE_DDHRESULT( 210 )
-+#define DDERR_NOCOOPERATIVELEVELSET MAKE_DDHRESULT( 212 )
-+#define DDERR_NOCOLORKEY MAKE_DDHRESULT( 215 )
-+#define DDERR_NOCOLORKEYHW MAKE_DDHRESULT( 220 )
-+#define DDERR_NODIRECTDRAWSUPPORT MAKE_DDHRESULT( 222 )
-+#define DDERR_NOEXCLUSIVEMODE MAKE_DDHRESULT( 225 )
-+#define DDERR_NOFLIPHW MAKE_DDHRESULT( 230 )
-+#define DDERR_NOGDI MAKE_DDHRESULT( 240 )
-+#define DDERR_NOMIRRORHW MAKE_DDHRESULT( 250 )
-+#define DDERR_NOTFOUND MAKE_DDHRESULT( 255 )
-+#define DDERR_NOOVERLAYHW MAKE_DDHRESULT( 260 )
-+#define DDERR_OVERLAPPINGRECTS MAKE_DDHRESULT( 270 )
-+#define DDERR_NORASTEROPHW MAKE_DDHRESULT( 280 )
-+#define DDERR_NOROTATIONHW MAKE_DDHRESULT( 290 )
-+#define DDERR_NOSTRETCHHW MAKE_DDHRESULT( 310 )
-+#define DDERR_NOT4BITCOLOR MAKE_DDHRESULT( 316 )
-+#define DDERR_NOT4BITCOLORINDEX MAKE_DDHRESULT( 317 )
-+#define DDERR_NOT8BITCOLOR MAKE_DDHRESULT( 320 )
-+#define DDERR_NOTEXTUREHW MAKE_DDHRESULT( 330 )
-+#define DDERR_NOVSYNCHW MAKE_DDHRESULT( 335 )
-+#define DDERR_NOZBUFFERHW MAKE_DDHRESULT( 340 )
-+#define DDERR_NOZOVERLAYHW MAKE_DDHRESULT( 350 )
-+#define DDERR_OUTOFCAPS MAKE_DDHRESULT( 360 )
-+#define DDERR_OUTOFMEMORY E_OUTOFMEMORY
-+#define DDERR_OUTOFVIDEOMEMORY MAKE_DDHRESULT( 380 )
-+#define DDERR_OVERLAYCANTCLIP MAKE_DDHRESULT( 382 )
-+#define DDERR_OVERLAYCOLORKEYONLYONEACTIVE MAKE_DDHRESULT( 384 )
-+#define DDERR_PALETTEBUSY MAKE_DDHRESULT( 387 )
-+#define DDERR_COLORKEYNOTSET MAKE_DDHRESULT( 400 )
-+#define DDERR_SURFACEALREADYATTACHED MAKE_DDHRESULT( 410 )
-+#define DDERR_SURFACEALREADYDEPENDENT MAKE_DDHRESULT( 420 )
-+#define DDERR_SURFACEBUSY MAKE_DDHRESULT( 430 )
-+#define DDERR_CANTLOCKSURFACE MAKE_DDHRESULT( 435 )
-+#define DDERR_SURFACEISOBSCURED MAKE_DDHRESULT( 440 )
-+#define DDERR_SURFACELOST MAKE_DDHRESULT( 450 )
-+#define DDERR_SURFACENOTATTACHED MAKE_DDHRESULT( 460 )
-+#define DDERR_TOOBIGHEIGHT MAKE_DDHRESULT( 470 )
-+#define DDERR_TOOBIGSIZE MAKE_DDHRESULT( 480 )
-+#define DDERR_TOOBIGWIDTH MAKE_DDHRESULT( 490 )
-+#define DDERR_UNSUPPORTED E_NOTIMPL
-+#define DDERR_UNSUPPORTEDFORMAT MAKE_DDHRESULT( 510 )
-+#define DDERR_UNSUPPORTEDMASK MAKE_DDHRESULT( 520 )
-+#define DDERR_INVALIDSTREAM MAKE_DDHRESULT( 521 )
-+#define DDERR_VERTICALBLANKINPROGRESS MAKE_DDHRESULT( 537 )
-+#define DDERR_WASSTILLDRAWING MAKE_DDHRESULT( 540 )
-+#define DDERR_DDSCAPSCOMPLEXREQUIRED MAKE_DDHRESULT( 542 )
-+#define DDERR_XALIGN MAKE_DDHRESULT( 560 )
-+#define DDERR_INVALIDDIRECTDRAWGUID MAKE_DDHRESULT( 561 )
-+#define DDERR_DIRECTDRAWALREADYCREATED MAKE_DDHRESULT( 562 )
-+#define DDERR_NODIRECTDRAWHW MAKE_DDHRESULT( 563 )
-+#define DDERR_PRIMARYSURFACEALREADYEXISTS MAKE_DDHRESULT( 564 )
-+#define DDERR_NOEMULATION MAKE_DDHRESULT( 565 )
-+#define DDERR_REGIONTOOSMALL MAKE_DDHRESULT( 566 )
-+#define DDERR_CLIPPERISUSINGHWND MAKE_DDHRESULT( 567 )
-+#define DDERR_NOCLIPPERATTACHED MAKE_DDHRESULT( 568 )
-+#define DDERR_NOHWND MAKE_DDHRESULT( 569 )
-+#define DDERR_HWNDSUBCLASSED MAKE_DDHRESULT( 570 )
-+#define DDERR_HWNDALREADYSET MAKE_DDHRESULT( 571 )
-+#define DDERR_NOPALETTEATTACHED MAKE_DDHRESULT( 572 )
-+#define DDERR_NOPALETTEHW MAKE_DDHRESULT( 573 )
-+#define DDERR_BLTFASTCANTCLIP MAKE_DDHRESULT( 574 )
-+#define DDERR_NOBLTHW MAKE_DDHRESULT( 575 )
-+#define DDERR_NODDROPSHW MAKE_DDHRESULT( 576 )
-+#define DDERR_OVERLAYNOTVISIBLE MAKE_DDHRESULT( 577 )
-+#define DDERR_NOOVERLAYDEST MAKE_DDHRESULT( 578 )
-+#define DDERR_INVALIDPOSITION MAKE_DDHRESULT( 579 )
-+#define DDERR_NOTAOVERLAYSURFACE MAKE_DDHRESULT( 580 )
-+#define DDERR_EXCLUSIVEMODEALREADYSET MAKE_DDHRESULT( 581 )
-+#define DDERR_NOTFLIPPABLE MAKE_DDHRESULT( 582 )
-+#define DDERR_CANTDUPLICATE MAKE_DDHRESULT( 583 )
-+#define DDERR_NOTLOCKED MAKE_DDHRESULT( 584 )
-+#define DDERR_CANTCREATEDC MAKE_DDHRESULT( 585 )
-+#define DDERR_NODC MAKE_DDHRESULT( 586 )
-+#define DDERR_WRONGMODE MAKE_DDHRESULT( 587 )
-+#define DDERR_IMPLICITLYCREATED MAKE_DDHRESULT( 588 )
-+#define DDERR_NOTPALETTIZED MAKE_DDHRESULT( 589 )
-+#define DDERR_UNSUPPORTEDMODE MAKE_DDHRESULT( 590 )
-+#define DDERR_NOMIPMAPHW MAKE_DDHRESULT( 591 )
-+#define DDERR_INVALIDSURFACETYPE MAKE_DDHRESULT( 592 )
-+#define DDERR_NOOPTIMIZEHW MAKE_DDHRESULT( 600 )
-+#define DDERR_NOTLOADED MAKE_DDHRESULT( 601 )
-+#define DDERR_NOFOCUSWINDOW MAKE_DDHRESULT( 602 )
-+#define DDERR_NOTONMIPMAPSUBLEVEL MAKE_DDHRESULT( 603 )
-+#define DDERR_DCALREADYCREATED MAKE_DDHRESULT( 620 )
-+#define DDERR_NONONLOCALVIDMEM MAKE_DDHRESULT( 630 )
-+#define DDERR_CANTPAGELOCK MAKE_DDHRESULT( 640 )
-+#define DDERR_CANTPAGEUNLOCK MAKE_DDHRESULT( 660 )
-+#define DDERR_NOTPAGELOCKED MAKE_DDHRESULT( 680 )
-+#define DDERR_MOREDATA MAKE_DDHRESULT( 690 )
-+#define DDERR_EXPIRED MAKE_DDHRESULT( 691 )
-+#define DDERR_TESTFINISHED MAKE_DDHRESULT( 692 )
-+#define DDERR_NEWMODE MAKE_DDHRESULT( 693 )
-+#define DDERR_D3DNOTINITIALIZED MAKE_DDHRESULT( 694 )
-+#define DDERR_VIDEONOTACTIVE MAKE_DDHRESULT( 695 )
-+#define DDERR_NOMONITORINFORMATION MAKE_DDHRESULT( 696 )
-+#define DDERR_NODRIVERSUPPORT MAKE_DDHRESULT( 697 )
-+#define DDERR_DEVICEDOESNTOWNSURFACE MAKE_DDHRESULT( 699 )
-+#define DDERR_NOTINITIALIZED CO_E_NOTINITIALIZED
-+
-+/* dwFlags for Blt* */
-+#define DDBLT_ALPHADEST 0x00000001
-+#define DDBLT_ALPHADESTCONSTOVERRIDE 0x00000002
-+#define DDBLT_ALPHADESTNEG 0x00000004
-+#define DDBLT_ALPHADESTSURFACEOVERRIDE 0x00000008
-+#define DDBLT_ALPHAEDGEBLEND 0x00000010
-+#define DDBLT_ALPHASRC 0x00000020
-+#define DDBLT_ALPHASRCCONSTOVERRIDE 0x00000040
-+#define DDBLT_ALPHASRCNEG 0x00000080
-+#define DDBLT_ALPHASRCSURFACEOVERRIDE 0x00000100
-+#define DDBLT_ASYNC 0x00000200
-+#define DDBLT_COLORFILL 0x00000400
-+#define DDBLT_DDFX 0x00000800
-+#define DDBLT_DDROPS 0x00001000
-+#define DDBLT_KEYDEST 0x00002000
-+#define DDBLT_KEYDESTOVERRIDE 0x00004000
-+#define DDBLT_KEYSRC 0x00008000
-+#define DDBLT_KEYSRCOVERRIDE 0x00010000
-+#define DDBLT_ROP 0x00020000
-+#define DDBLT_ROTATIONANGLE 0x00040000
-+#define DDBLT_ZBUFFER 0x00080000
-+#define DDBLT_ZBUFFERDESTCONSTOVERRIDE 0x00100000
-+#define DDBLT_ZBUFFERDESTOVERRIDE 0x00200000
-+#define DDBLT_ZBUFFERSRCCONSTOVERRIDE 0x00400000
-+#define DDBLT_ZBUFFERSRCOVERRIDE 0x00800000
-+#define DDBLT_WAIT 0x01000000
-+#define DDBLT_DEPTHFILL 0x02000000
-+#define DDBLT_DONOTWAIT 0x08000000
-+
-+/* dwTrans for BltFast */
-+#define DDBLTFAST_NOCOLORKEY 0x00000000
-+#define DDBLTFAST_SRCCOLORKEY 0x00000001
-+#define DDBLTFAST_DESTCOLORKEY 0x00000002
-+#define DDBLTFAST_WAIT 0x00000010
-+#define DDBLTFAST_DONOTWAIT 0x00000020
-+
-+/* dwFlags for Flip */
-+#define DDFLIP_WAIT 0x00000001
-+#define DDFLIP_EVEN 0x00000002 /* only valid for overlay */
-+#define DDFLIP_ODD 0x00000004 /* only valid for overlay */
-+#define DDFLIP_NOVSYNC 0x00000008
-+#define DDFLIP_STEREO 0x00000010
-+#define DDFLIP_DONOTWAIT 0x00000020
-+#define DDFLIP_INTERVAL2 0x02000000
-+#define DDFLIP_INTERVAL3 0x03000000
-+#define DDFLIP_INTERVAL4 0x04000000
-+
-+
-+/* dwFlags for GetBltStatus */
-+#define DDGBS_CANBLT 0x00000001
-+#define DDGBS_ISBLTDONE 0x00000002
-+
-+/* dwFlags for IDirectDrawSurface7::GetFlipStatus */
-+#define DDGFS_CANFLIP 1L
-+#define DDGFS_ISFLIPDONE 2L
-+
-+/* dwFlags for IDirectDrawSurface7::SetPrivateData */
-+#define DDSPD_IUNKNOWNPOINTER 1L
-+#define DDSPD_VOLATILE 2L
-+
-+/* DDSCAPS.dwCaps */
-+/* reserved1, was 3d capable */
-+#define DDSCAPS_RESERVED1 0x00000001
-+/* surface contains alpha information */
-+#define DDSCAPS_ALPHA 0x00000002
-+/* this surface is a backbuffer */
-+#define DDSCAPS_BACKBUFFER 0x00000004
-+/* complex surface structure */
-+#define DDSCAPS_COMPLEX 0x00000008
-+/* part of surface flipping structure */
-+#define DDSCAPS_FLIP 0x00000010
-+/* this surface is the frontbuffer surface */
-+#define DDSCAPS_FRONTBUFFER 0x00000020
-+/* this is a plain offscreen surface */
-+#define DDSCAPS_OFFSCREENPLAIN 0x00000040
-+/* overlay */
-+#define DDSCAPS_OVERLAY 0x00000080
-+/* palette objects can be created and attached to us */
-+#define DDSCAPS_PALETTE 0x00000100
-+/* primary surface (the one the user looks at currently)(right eye)*/
-+#define DDSCAPS_PRIMARYSURFACE 0x00000200
-+/* primary surface for left eye */
-+#define DDSCAPS_PRIMARYSURFACELEFT 0x00000400
-+/* surface exists in systemmemory */
-+#define DDSCAPS_SYSTEMMEMORY 0x00000800
-+/* surface can be used as a texture */
-+#define DDSCAPS_TEXTURE 0x00001000
-+/* surface may be destination for 3d rendering */
-+#define DDSCAPS_3DDEVICE 0x00002000
-+/* surface exists in videomemory */
-+#define DDSCAPS_VIDEOMEMORY 0x00004000
-+/* surface changes immediately visible */
-+#define DDSCAPS_VISIBLE 0x00008000
-+/* write only surface */
-+#define DDSCAPS_WRITEONLY 0x00010000
-+/* zbuffer surface */
-+#define DDSCAPS_ZBUFFER 0x00020000
-+/* has its own DC */
-+#define DDSCAPS_OWNDC 0x00040000
-+/* surface should be able to receive live video */
-+#define DDSCAPS_LIVEVIDEO 0x00080000
-+/* should be able to have a hw codec decompress stuff into it */
-+#define DDSCAPS_HWCODEC 0x00100000
-+/* mode X (320x200 or 320x240) surface */
-+#define DDSCAPS_MODEX 0x00200000
-+/* one mipmap surface (1 level) */
-+#define DDSCAPS_MIPMAP 0x00400000
-+#define DDSCAPS_RESERVED2 0x00800000
-+/* memory allocation delayed until Load() */
-+#define DDSCAPS_ALLOCONLOAD 0x04000000
-+/* Indicates that the surface will receive data from a video port */
-+#define DDSCAPS_VIDEOPORT 0x08000000
-+/* surface is in local videomemory */
-+#define DDSCAPS_LOCALVIDMEM 0x10000000
-+/* surface is in nonlocal videomemory */
-+#define DDSCAPS_NONLOCALVIDMEM 0x20000000
-+/* surface is a standard VGA mode surface (NOT ModeX) */
-+#define DDSCAPS_STANDARDVGAMODE 0x40000000
-+/* optimized? surface */
-+#define DDSCAPS_OPTIMIZED 0x80000000
-+
-+typedef struct _DDSCAPS {
-+ DWORD dwCaps; /* capabilities of surface wanted */
-+} DDSCAPS,*LPDDSCAPS;
-+
-+/* DDSCAPS2.dwCaps2 */
-+/* indicates the surface will receive data from a video port using
-+ deinterlacing hardware. */
-+#define DDSCAPS2_HARDWAREDEINTERLACE 0x00000002
-+/* indicates the surface will be locked very frequently. */
-+#define DDSCAPS2_HINTDYNAMIC 0x00000004
-+/* indicates surface can be re-ordered or retiled on load() */
-+#define DDSCAPS2_HINTSTATIC 0x00000008
-+/* indicates surface to be managed by directdraw/direct3D */
-+#define DDSCAPS2_TEXTUREMANAGE 0x00000010
-+/* reserved bits */
-+#define DDSCAPS2_RESERVED1 0x00000020
-+#define DDSCAPS2_RESERVED2 0x00000040
-+/* indicates surface will never be locked again */
-+#define DDSCAPS2_OPAQUE 0x00000080
-+/* set at CreateSurface() time to indicate antialiasing will be used */
-+#define DDSCAPS2_HINTANTIALIASING 0x00000100
-+/* set at CreateSurface() time to indicate cubic environment map */
-+#define DDSCAPS2_CUBEMAP 0x00000200
-+/* face flags for cube maps */
-+#define DDSCAPS2_CUBEMAP_POSITIVEX 0x00000400
-+#define DDSCAPS2_CUBEMAP_NEGATIVEX 0x00000800
-+#define DDSCAPS2_CUBEMAP_POSITIVEY 0x00001000
-+#define DDSCAPS2_CUBEMAP_NEGATIVEY 0x00002000
-+#define DDSCAPS2_CUBEMAP_POSITIVEZ 0x00004000
-+#define DDSCAPS2_CUBEMAP_NEGATIVEZ 0x00008000
-+/* specifies all faces of a cube for CreateSurface() */
-+#define DDSCAPS2_CUBEMAP_ALLFACES ( DDSCAPS2_CUBEMAP_POSITIVEX |\
-+ DDSCAPS2_CUBEMAP_NEGATIVEX |\
-+ DDSCAPS2_CUBEMAP_POSITIVEY |\
-+ DDSCAPS2_CUBEMAP_NEGATIVEY |\
-+ DDSCAPS2_CUBEMAP_POSITIVEZ |\
-+ DDSCAPS2_CUBEMAP_NEGATIVEZ )
-+/* set for mipmap sublevels on DirectX7 and later. ignored by CreateSurface() */
-+#define DDSCAPS2_MIPMAPSUBLEVEL 0x00010000
-+/* indicates texture surface to be managed by Direct3D *only* */
-+#define DDSCAPS2_D3DTEXTUREMANAGE 0x00020000
-+/* indicates managed surface that can safely be lost */
-+#define DDSCAPS2_DONOTPERSIST 0x00040000
-+/* indicates surface is part of a stereo flipping chain */
-+#define DDSCAPS2_STEREOSURFACELEFT 0x00080000
-+
-+typedef struct _DDSCAPS2 {
-+ DWORD dwCaps; /* capabilities of surface wanted */
-+ DWORD dwCaps2; /* additional capabilities */
-+ DWORD dwCaps3; /* reserved capabilities */
-+ DWORD dwCaps4; /* more reserved capabilities */
-+} DDSCAPS2,*LPDDSCAPS2;
-+
-+#define DD_ROP_SPACE (256/32) /* space required to store ROP array */
-+
-+typedef struct _DDCAPS_DX7 /* DirectX 7 version of caps struct */
-+{
-+ DWORD dwSize; /* size of the DDDRIVERCAPS structure */
-+ DWORD dwCaps; /* driver specific capabilities */
-+ DWORD dwCaps2; /* more driver specific capabilities */
-+ DWORD dwCKeyCaps; /* color key capabilities of the surface */
-+ DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
-+ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
-+ DWORD dwPalCaps; /* palette capabilities */
-+ DWORD dwSVCaps; /* stereo vision capabilities */
-+ DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwZBufferBitDepths; /* DDBD_8,16,24,32 */
-+ DWORD dwVidMemTotal; /* total amount of video memory */
-+ DWORD dwVidMemFree; /* amount of free video memory */
-+ DWORD dwMaxVisibleOverlays; /* maximum number of visible overlays */
-+ DWORD dwCurrVisibleOverlays; /* current number of visible overlays */
-+ DWORD dwNumFourCCCodes; /* number of four cc codes */
-+ DWORD dwAlignBoundarySrc; /* source rectangle alignment */
-+ DWORD dwAlignSizeSrc; /* source rectangle byte size */
-+ DWORD dwAlignBoundaryDest; /* dest rectangle alignment */
-+ DWORD dwAlignSizeDest; /* dest rectangle byte size */
-+ DWORD dwAlignStrideAlign; /* stride alignment */
-+ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
-+ DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
-+ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ DWORD dwReserved3;
-+ DWORD dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
-+ DWORD dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
-+ DWORD dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
-+ DWORD dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-+ DWORD dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
-+ DWORD dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
-+ DWORD dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
-+ DWORD dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-+ DWORD dwSSBCaps; /* driver specific capabilities for System->System blts */
-+ DWORD dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
-+ DWORD dwSSBFXCaps; /* driver FX capabilities for System->System blts */
-+ DWORD dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
-+ DWORD dwCurrVideoPorts; /* current number of video ports used */
-+ DWORD dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
-+ DWORD dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
-+ DWORD dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
-+ DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-+ DDSCAPS2 ddsCaps; /* surface capabilities */
-+} DDCAPS_DX7,*LPDDCAPS_DX7;
-+
-+typedef struct _DDCAPS_DX6 /* DirectX 6 version of caps struct */
-+{
-+ DWORD dwSize; /* size of the DDDRIVERCAPS structure */
-+ DWORD dwCaps; /* driver specific capabilities */
-+ DWORD dwCaps2; /* more driver specific capabilities */
-+ DWORD dwCKeyCaps; /* color key capabilities of the surface */
-+ DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
-+ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
-+ DWORD dwPalCaps; /* palette capabilities */
-+ DWORD dwSVCaps; /* stereo vision capabilities */
-+ DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwZBufferBitDepths; /* DDBD_8,16,24,32 */
-+ DWORD dwVidMemTotal; /* total amount of video memory */
-+ DWORD dwVidMemFree; /* amount of free video memory */
-+ DWORD dwMaxVisibleOverlays; /* maximum number of visible overlays */
-+ DWORD dwCurrVisibleOverlays; /* current number of visible overlays */
-+ DWORD dwNumFourCCCodes; /* number of four cc codes */
-+ DWORD dwAlignBoundarySrc; /* source rectangle alignment */
-+ DWORD dwAlignSizeSrc; /* source rectangle byte size */
-+ DWORD dwAlignBoundaryDest; /* dest rectangle alignment */
-+ DWORD dwAlignSizeDest; /* dest rectangle byte size */
-+ DWORD dwAlignStrideAlign; /* stride alignment */
-+ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
-+ DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
-+ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ DWORD dwReserved3;
-+ DWORD dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
-+ DWORD dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
-+ DWORD dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
-+ DWORD dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-+ DWORD dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
-+ DWORD dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
-+ DWORD dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
-+ DWORD dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-+ DWORD dwSSBCaps; /* driver specific capabilities for System->System blts */
-+ DWORD dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
-+ DWORD dwSSBFXCaps; /* driver FX capabilities for System->System blts */
-+ DWORD dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
-+ DWORD dwCurrVideoPorts; /* current number of video ports used */
-+ DWORD dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
-+ DWORD dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
-+ DWORD dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
-+ DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-+ /* and one new member for DirectX 6 */
-+ DDSCAPS2 ddsCaps; /* surface capabilities */
-+} DDCAPS_DX6,*LPDDCAPS_DX6;
-+
-+typedef struct _DDCAPS_DX5 /* DirectX5 version of caps struct */
-+{
-+ DWORD dwSize; /* size of the DDDRIVERCAPS structure */
-+ DWORD dwCaps; /* driver specific capabilities */
-+ DWORD dwCaps2; /* more driver specific capabilities */
-+ DWORD dwCKeyCaps; /* color key capabilities of the surface */
-+ DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
-+ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
-+ DWORD dwPalCaps; /* palette capabilities */
-+ DWORD dwSVCaps; /* stereo vision capabilities */
-+ DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwZBufferBitDepths; /* DDBD_8,16,24,32 */
-+ DWORD dwVidMemTotal; /* total amount of video memory */
-+ DWORD dwVidMemFree; /* amount of free video memory */
-+ DWORD dwMaxVisibleOverlays; /* maximum number of visible overlays */
-+ DWORD dwCurrVisibleOverlays; /* current number of visible overlays */
-+ DWORD dwNumFourCCCodes; /* number of four cc codes */
-+ DWORD dwAlignBoundarySrc; /* source rectangle alignment */
-+ DWORD dwAlignSizeSrc; /* source rectangle byte size */
-+ DWORD dwAlignBoundaryDest; /* dest rectangle alignment */
-+ DWORD dwAlignSizeDest; /* dest rectangle byte size */
-+ DWORD dwAlignStrideAlign; /* stride alignment */
-+ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
-+ DDSCAPS ddsCaps; /* DDSCAPS structure has all the general capabilities */
-+ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ DWORD dwReserved3;
-+ DWORD dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
-+ DWORD dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
-+ DWORD dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
-+ DWORD dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-+ DWORD dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
-+ DWORD dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
-+ DWORD dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
-+ DWORD dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-+ DWORD dwSSBCaps; /* driver specific capabilities for System->System blts */
-+ DWORD dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
-+ DWORD dwSSBFXCaps; /* driver FX capabilities for System->System blts */
-+ DWORD dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-+ /* the following are the new DirectX 5 members */
-+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
-+ DWORD dwCurrVideoPorts; /* current number of video ports used */
-+ DWORD dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
-+ DWORD dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
-+ DWORD dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
-+ DWORD dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
-+ DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-+} DDCAPS_DX5,*LPDDCAPS_DX5;
-+
-+typedef struct _DDCAPS_DX3 /* DirectX3 version of caps struct */
-+{
-+ DWORD dwSize; /* size of the DDDRIVERCAPS structure */
-+ DWORD dwCaps; /* driver specific capabilities */
-+ DWORD dwCaps2; /* more driver specific capabilities */
-+ DWORD dwCKeyCaps; /* color key capabilities of the surface */
-+ DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
-+ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
-+ DWORD dwPalCaps; /* palette capabilities */
-+ DWORD dwSVCaps; /* stereo vision capabilities */
-+ DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
-+ DWORD dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-+ DWORD dwZBufferBitDepths; /* DDBD_8,16,24,32 */
-+ DWORD dwVidMemTotal; /* total amount of video memory */
-+ DWORD dwVidMemFree; /* amount of free video memory */
-+ DWORD dwMaxVisibleOverlays; /* maximum number of visible overlays */
-+ DWORD dwCurrVisibleOverlays; /* current number of visible overlays */
-+ DWORD dwNumFourCCCodes; /* number of four cc codes */
-+ DWORD dwAlignBoundarySrc; /* source rectangle alignment */
-+ DWORD dwAlignSizeSrc; /* source rectangle byte size */
-+ DWORD dwAlignBoundaryDest; /* dest rectangle alignment */
-+ DWORD dwAlignSizeDest; /* dest rectangle byte size */
-+ DWORD dwAlignStrideAlign; /* stride alignment */
-+ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
-+ DDSCAPS ddsCaps; /* DDSCAPS structure has all the general capabilities */
-+ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-+ DWORD dwReserved1;
-+ DWORD dwReserved2;
-+ DWORD dwReserved3;
-+ DWORD dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
-+ DWORD dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
-+ DWORD dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
-+ DWORD dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-+ DWORD dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
-+ DWORD dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
-+ DWORD dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
-+ DWORD dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-+ DWORD dwSSBCaps; /* driver specific capabilities for System->System blts */
-+ DWORD dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
-+ DWORD dwSSBFXCaps; /* driver FX capabilities for System->System blts */
-+ DWORD dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-+ DWORD dwReserved4;
-+ DWORD dwReserved5;
-+ DWORD dwReserved6;
-+} DDCAPS_DX3,*LPDDCAPS_DX3;
-+
-+/* set caps struct according to DIRECTDRAW_VERSION */
-+
-+#if DIRECTDRAW_VERSION <= 0x300
-+typedef DDCAPS_DX3 DDCAPS;
-+#elif DIRECTDRAW_VERSION <= 0x500
-+typedef DDCAPS_DX5 DDCAPS;
-+#elif DIRECTDRAW_VERSION <= 0x600
-+typedef DDCAPS_DX6 DDCAPS;
-+#else
-+typedef DDCAPS_DX7 DDCAPS;
-+#endif
-+
-+typedef DDCAPS *LPDDCAPS;
-+
-+/* DDCAPS.dwCaps */
-+#define DDCAPS_3D 0x00000001
-+#define DDCAPS_ALIGNBOUNDARYDEST 0x00000002
-+#define DDCAPS_ALIGNSIZEDEST 0x00000004
-+#define DDCAPS_ALIGNBOUNDARYSRC 0x00000008
-+#define DDCAPS_ALIGNSIZESRC 0x00000010
-+#define DDCAPS_ALIGNSTRIDE 0x00000020
-+#define DDCAPS_BLT 0x00000040
-+#define DDCAPS_BLTQUEUE 0x00000080
-+#define DDCAPS_BLTFOURCC 0x00000100
-+#define DDCAPS_BLTSTRETCH 0x00000200
-+#define DDCAPS_GDI 0x00000400
-+#define DDCAPS_OVERLAY 0x00000800
-+#define DDCAPS_OVERLAYCANTCLIP 0x00001000
-+#define DDCAPS_OVERLAYFOURCC 0x00002000
-+#define DDCAPS_OVERLAYSTRETCH 0x00004000
-+#define DDCAPS_PALETTE 0x00008000
-+#define DDCAPS_PALETTEVSYNC 0x00010000
-+#define DDCAPS_READSCANLINE 0x00020000
-+#define DDCAPS_STEREOVIEW 0x00040000
-+#define DDCAPS_VBI 0x00080000
-+#define DDCAPS_ZBLTS 0x00100000
-+#define DDCAPS_ZOVERLAYS 0x00200000
-+#define DDCAPS_COLORKEY 0x00400000
-+#define DDCAPS_ALPHA 0x00800000
-+#define DDCAPS_COLORKEYHWASSIST 0x01000000
-+#define DDCAPS_NOHARDWARE 0x02000000
-+#define DDCAPS_BLTCOLORFILL 0x04000000
-+#define DDCAPS_BANKSWITCHED 0x08000000
-+#define DDCAPS_BLTDEPTHFILL 0x10000000
-+#define DDCAPS_CANCLIP 0x20000000
-+#define DDCAPS_CANCLIPSTRETCHED 0x40000000
-+#define DDCAPS_CANBLTSYSMEM 0x80000000
-+
-+/* DDCAPS.dwCaps2 */
-+#define DDCAPS2_CERTIFIED 0x00000001
-+#define DDCAPS2_NO2DDURING3DSCENE 0x00000002
-+#define DDCAPS2_VIDEOPORT 0x00000004
-+#define DDCAPS2_AUTOFLIPOVERLAY 0x00000008
-+#define DDCAPS2_CANBOBINTERLEAVED 0x00000010
-+#define DDCAPS2_CANBOBNONINTERLEAVED 0x00000020
-+#define DDCAPS2_COLORCONTROLOVERLAY 0x00000040
-+#define DDCAPS2_COLORCONTROLPRIMARY 0x00000080
-+#define DDCAPS2_CANDROPZ16BIT 0x00000100
-+#define DDCAPS2_NONLOCALVIDMEM 0x00000200
-+#define DDCAPS2_NONLOCALVIDMEMCAPS 0x00000400
-+#define DDCAPS2_NOPAGELOCKREQUIRED 0x00000800
-+#define DDCAPS2_WIDESURFACES 0x00001000
-+#define DDCAPS2_CANFLIPODDEVEN 0x00002000
-+#define DDCAPS2_CANBOBHARDWARE 0x00004000
-+#define DDCAPS2_COPYFOURCC 0x00008000
-+#define DDCAPS2_PRIMARYGAMMA 0x00020000
-+#define DDCAPS2_CANRENDERWINDOWED 0x00080000
-+#define DDCAPS2_CANCALIBRATEGAMMA 0x00100000
-+#define DDCAPS2_FLIPINTERVAL 0x00200000
-+#define DDCAPS2_FLIPNOVSYNC 0x00400000
-+#define DDCAPS2_CANMANAGETEXTURE 0x00800000
-+#define DDCAPS2_TEXMANINNONLOCALVIDMEM 0x01000000
-+#define DDCAPS2_STEREO 0x02000000
-+#define DDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL 0x04000000
-+
-+
-+/* Set/Get Colour Key Flags */
-+#define DDCKEY_COLORSPACE 0x00000001 /* Struct is single colour space */
-+#define DDCKEY_DESTBLT 0x00000002 /* To be used as dest for blt */
-+#define DDCKEY_DESTOVERLAY 0x00000004 /* To be used as dest for CK overlays */
-+#define DDCKEY_SRCBLT 0x00000008 /* To be used as src for blt */
-+#define DDCKEY_SRCOVERLAY 0x00000010 /* To be used as src for CK overlays */
-+
-+typedef struct _DDCOLORKEY
-+{
-+ DWORD dwColorSpaceLowValue;/* low boundary of color space that is to
-+ * be treated as Color Key, inclusive
-+ */
-+ DWORD dwColorSpaceHighValue;/* high boundary of color space that is
-+ * to be treated as Color Key, inclusive
-+ */
-+} DDCOLORKEY,*LPDDCOLORKEY;
-+
-+/* ddCKEYCAPS bits */
-+#define DDCKEYCAPS_DESTBLT 0x00000001
-+#define DDCKEYCAPS_DESTBLTCLRSPACE 0x00000002
-+#define DDCKEYCAPS_DESTBLTCLRSPACEYUV 0x00000004
-+#define DDCKEYCAPS_DESTBLTYUV 0x00000008
-+#define DDCKEYCAPS_DESTOVERLAY 0x00000010
-+#define DDCKEYCAPS_DESTOVERLAYCLRSPACE 0x00000020
-+#define DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV 0x00000040
-+#define DDCKEYCAPS_DESTOVERLAYONEACTIVE 0x00000080
-+#define DDCKEYCAPS_DESTOVERLAYYUV 0x00000100
-+#define DDCKEYCAPS_SRCBLT 0x00000200
-+#define DDCKEYCAPS_SRCBLTCLRSPACE 0x00000400
-+#define DDCKEYCAPS_SRCBLTCLRSPACEYUV 0x00000800
-+#define DDCKEYCAPS_SRCBLTYUV 0x00001000
-+#define DDCKEYCAPS_SRCOVERLAY 0x00002000
-+#define DDCKEYCAPS_SRCOVERLAYCLRSPACE 0x00004000
-+#define DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV 0x00008000
-+#define DDCKEYCAPS_SRCOVERLAYONEACTIVE 0x00010000
-+#define DDCKEYCAPS_SRCOVERLAYYUV 0x00020000
-+#define DDCKEYCAPS_NOCOSTOVERLAY 0x00040000
-+
-+typedef struct _DDPIXELFORMAT {
-+ DWORD dwSize; /* 0: size of structure */
-+ DWORD dwFlags; /* 4: pixel format flags */
-+ DWORD dwFourCC; /* 8: (FOURCC code) */
-+ union {
-+ DWORD dwRGBBitCount; /* C: how many bits per pixel */
-+ DWORD dwYUVBitCount; /* C: how many bits per pixel */
-+ DWORD dwZBufferBitDepth; /* C: how many bits for z buffers */
-+ DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/
-+ DWORD dwLuminanceBitCount;
-+ DWORD dwBumpBitCount;
-+ } DUMMYUNIONNAME;
-+ union {
-+ DWORD dwRBitMask; /* 10: mask for red bit*/
-+ DWORD dwYBitMask; /* 10: mask for Y bits*/
-+ DWORD dwStencilBitDepth;
-+ DWORD dwLuminanceBitMask;
-+ DWORD dwBumpDuBitMask;
-+ } DUMMYUNIONNAME2;
-+ union {
-+ DWORD dwGBitMask; /* 14: mask for green bits*/
-+ DWORD dwUBitMask; /* 14: mask for U bits*/
-+ DWORD dwZBitMask;
-+ DWORD dwBumpDvBitMask;
-+ } DUMMYUNIONNAME3;
-+ union {
-+ DWORD dwBBitMask; /* 18: mask for blue bits*/
-+ DWORD dwVBitMask; /* 18: mask for V bits*/
-+ DWORD dwStencilBitMask;
-+ DWORD dwBumpLuminanceBitMask;
-+ } DUMMYUNIONNAME4;
-+ union {
-+ DWORD dwRGBAlphaBitMask; /* 1C: mask for alpha channel */
-+ DWORD dwYUVAlphaBitMask; /* 1C: mask for alpha channel */
-+ DWORD dwLuminanceAlphaBitMask;
-+ DWORD dwRGBZBitMask; /* 1C: mask for Z channel */
-+ DWORD dwYUVZBitMask; /* 1C: mask for Z channel */
-+ } DUMMYUNIONNAME5;
-+ /* 20: next structure */
-+} DDPIXELFORMAT,*LPDDPIXELFORMAT;
-+
-+#ifndef __MINGW32__
-+#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
-+ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
-+ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
-+#endif
-+
-+/* DDCAPS.dwFXCaps */
-+#define DDFXCAPS_BLTALPHA 0x00000001
-+#define DDFXCAPS_OVERLAYALPHA 0x00000004
-+#define DDFXCAPS_BLTARITHSTRETCHYN 0x00000010
-+#define DDFXCAPS_BLTARITHSTRETCHY 0x00000020
-+#define DDFXCAPS_BLTMIRRORLEFTRIGHT 0x00000040
-+#define DDFXCAPS_BLTMIRRORUPDOWN 0x00000080
-+#define DDFXCAPS_BLTROTATION 0x00000100
-+#define DDFXCAPS_BLTROTATION90 0x00000200
-+#define DDFXCAPS_BLTSHRINKX 0x00000400
-+#define DDFXCAPS_BLTSHRINKXN 0x00000800
-+#define DDFXCAPS_BLTSHRINKY 0x00001000
-+#define DDFXCAPS_BLTSHRINKYN 0x00002000
-+#define DDFXCAPS_BLTSTRETCHX 0x00004000
-+#define DDFXCAPS_BLTSTRETCHXN 0x00008000
-+#define DDFXCAPS_BLTSTRETCHY 0x00010000
-+#define DDFXCAPS_BLTSTRETCHYN 0x00020000
-+#define DDFXCAPS_OVERLAYARITHSTRETCHY 0x00040000
-+#define DDFXCAPS_OVERLAYARITHSTRETCHYN 0x00000008
-+#define DDFXCAPS_OVERLAYSHRINKX 0x00080000
-+#define DDFXCAPS_OVERLAYSHRINKXN 0x00100000
-+#define DDFXCAPS_OVERLAYSHRINKY 0x00200000
-+#define DDFXCAPS_OVERLAYSHRINKYN 0x00400000
-+#define DDFXCAPS_OVERLAYSTRETCHX 0x00800000
-+#define DDFXCAPS_OVERLAYSTRETCHXN 0x01000000
-+#define DDFXCAPS_OVERLAYSTRETCHY 0x02000000
-+#define DDFXCAPS_OVERLAYSTRETCHYN 0x04000000
-+#define DDFXCAPS_OVERLAYMIRRORLEFTRIGHT 0x08000000
-+#define DDFXCAPS_OVERLAYMIRRORUPDOWN 0x10000000
-+
-+#define DDFXCAPS_OVERLAYFILTER DDFXCAPS_OVERLAYARITHSTRETCHY
-+
-+/* DDCAPS.dwFXAlphaCaps */
-+#define DDFXALPHACAPS_BLTALPHAEDGEBLEND 0x00000001
-+#define DDFXALPHACAPS_BLTALPHAPIXELS 0x00000002
-+#define DDFXALPHACAPS_BLTALPHAPIXELSNEG 0x00000004
-+#define DDFXALPHACAPS_BLTALPHASURFACES 0x00000008
-+#define DDFXALPHACAPS_BLTALPHASURFACESNEG 0x00000010
-+#define DDFXALPHACAPS_OVERLAYALPHAEDGEBLEND 0x00000020
-+#define DDFXALPHACAPS_OVERLAYALPHAPIXELS 0x00000040
-+#define DDFXALPHACAPS_OVERLAYALPHAPIXELSNEG 0x00000080
-+#define DDFXALPHACAPS_OVERLAYALPHASURFACES 0x00000100
-+#define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG 0x00000200
-+
-+/* DDCAPS.dwPalCaps */
-+#define DDPCAPS_4BIT 0x00000001
-+#define DDPCAPS_8BITENTRIES 0x00000002
-+#define DDPCAPS_8BIT 0x00000004
-+#define DDPCAPS_INITIALIZE 0x00000008
-+#define DDPCAPS_PRIMARYSURFACE 0x00000010
-+#define DDPCAPS_PRIMARYSURFACELEFT 0x00000020
-+#define DDPCAPS_ALLOW256 0x00000040
-+#define DDPCAPS_VSYNC 0x00000080
-+#define DDPCAPS_1BIT 0x00000100
-+#define DDPCAPS_2BIT 0x00000200
-+#define DDPCAPS_ALPHA 0x00000400
-+
-+/* DDCAPS.dwSVCaps */
-+/* the first 4 of these are now obsolete */
-+#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occurred */
-+#define DDSVCAPS_RESERVED1 0x00000001
-+#define DDSVCAPS_RESERVED2 0x00000002
-+#define DDSVCAPS_RESERVED3 0x00000004
-+#define DDSVCAPS_RESERVED4 0x00000008
-+#else
-+#define DDSVCAPS_ENIGMA 0x00000001
-+#define DDSVCAPS_FLICKER 0x00000002
-+#define DDSVCAPS_REDBLUE 0x00000004
-+#define DDSVCAPS_SPLIT 0x00000008
-+#endif
-+#define DDSVCAPS_STEREOSEQUENTIAL 0x00000010
-+
-+/* BitDepths */
-+#define DDBD_1 0x00004000
-+#define DDBD_2 0x00002000
-+#define DDBD_4 0x00001000
-+#define DDBD_8 0x00000800
-+#define DDBD_16 0x00000400
-+#define DDBD_24 0x00000200
-+#define DDBD_32 0x00000100
-+
-+/* DDOVERLAYFX.dwDDFX */
-+#define DDOVERFX_ARITHSTRETCHY 0x00000001
-+#define DDOVERFX_MIRRORLEFTRIGHT 0x00000002
-+#define DDOVERFX_MIRRORUPDOWN 0x00000004
-+
-+/* UpdateOverlay flags */
-+#define DDOVER_ALPHADEST 0x00000001
-+#define DDOVER_ALPHADESTCONSTOVERRIDE 0x00000002
-+#define DDOVER_ALPHADESTNEG 0x00000004
-+#define DDOVER_ALPHADESTSURFACEOVERRIDE 0x00000008
-+#define DDOVER_ALPHAEDGEBLEND 0x00000010
-+#define DDOVER_ALPHASRC 0x00000020
-+#define DDOVER_ALPHASRCCONSTOVERRIDE 0x00000040
-+#define DDOVER_ALPHASRCNEG 0x00000080
-+#define DDOVER_ALPHASRCSURFACEOVERRIDE 0x00000100
-+#define DDOVER_HIDE 0x00000200
-+#define DDOVER_KEYDEST 0x00000400
-+#define DDOVER_KEYDESTOVERRIDE 0x00000800
-+#define DDOVER_KEYSRC 0x00001000
-+#define DDOVER_KEYSRCOVERRIDE 0x00002000
-+#define DDOVER_SHOW 0x00004000
-+#define DDOVER_ADDDIRTYRECT 0x00008000
-+#define DDOVER_REFRESHDIRTYRECTS 0x00010000
-+#define DDOVER_REFRESHALL 0x00020000
-+#define DDOVER_DDFX 0x00080000
-+#define DDOVER_AUTOFLIP 0x00100000
-+#define DDOVER_BOB 0x00200000
-+#define DDOVER_OVERRIDEBOBWEAVE 0x00400000
-+#define DDOVER_INTERLEAVED 0x00800000
-+
-+/* DDCOLORKEY.dwFlags */
-+#define DDPF_ALPHAPIXELS 0x00000001
-+#define DDPF_ALPHA 0x00000002
-+#define DDPF_FOURCC 0x00000004
-+#define DDPF_PALETTEINDEXED4 0x00000008
-+#define DDPF_PALETTEINDEXEDTO8 0x00000010
-+#define DDPF_PALETTEINDEXED8 0x00000020
-+#define DDPF_RGB 0x00000040
-+#define DDPF_COMPRESSED 0x00000080
-+#define DDPF_RGBTOYUV 0x00000100
-+#define DDPF_YUV 0x00000200
-+#define DDPF_ZBUFFER 0x00000400
-+#define DDPF_PALETTEINDEXED1 0x00000800
-+#define DDPF_PALETTEINDEXED2 0x00001000
-+#define DDPF_ZPIXELS 0x00002000
-+#define DDPF_STENCILBUFFER 0x00004000
-+#define DDPF_ALPHAPREMULT 0x00008000
-+#define DDPF_LUMINANCE 0x00020000
-+#define DDPF_BUMPLUMINANCE 0x00040000
-+#define DDPF_BUMPDUDV 0x00080000
-+
-+/* SetCooperativeLevel dwFlags */
-+#define DDSCL_FULLSCREEN 0x00000001
-+#define DDSCL_ALLOWREBOOT 0x00000002
-+#define DDSCL_NOWINDOWCHANGES 0x00000004
-+#define DDSCL_NORMAL 0x00000008
-+#define DDSCL_EXCLUSIVE 0x00000010
-+#define DDSCL_ALLOWMODEX 0x00000040
-+#define DDSCL_SETFOCUSWINDOW 0x00000080
-+#define DDSCL_SETDEVICEWINDOW 0x00000100
-+#define DDSCL_CREATEDEVICEWINDOW 0x00000200
-+#define DDSCL_MULTITHREADED 0x00000400
-+#define DDSCL_FPUSETUP 0x00000800
-+#define DDSCL_FPUPRESERVE 0x00001000
-+
-+
-+/* DDSURFACEDESC.dwFlags */
-+#define DDSD_CAPS 0x00000001
-+#define DDSD_HEIGHT 0x00000002
-+#define DDSD_WIDTH 0x00000004
-+#define DDSD_PITCH 0x00000008
-+#define DDSD_BACKBUFFERCOUNT 0x00000020
-+#define DDSD_ZBUFFERBITDEPTH 0x00000040
-+#define DDSD_ALPHABITDEPTH 0x00000080
-+#define DDSD_LPSURFACE 0x00000800
-+#define DDSD_PIXELFORMAT 0x00001000
-+#define DDSD_CKDESTOVERLAY 0x00002000
-+#define DDSD_CKDESTBLT 0x00004000
-+#define DDSD_CKSRCOVERLAY 0x00008000
-+#define DDSD_CKSRCBLT 0x00010000
-+#define DDSD_MIPMAPCOUNT 0x00020000
-+#define DDSD_REFRESHRATE 0x00040000
-+#define DDSD_LINEARSIZE 0x00080000
-+#define DDSD_TEXTURESTAGE 0x00100000
-+#define DDSD_FVF 0x00200000
-+#define DDSD_SRCVBHANDLE 0x00400000
-+#define DDSD_ALL 0x007ff9ee
-+
-+/* EnumSurfaces flags */
-+#define DDENUMSURFACES_ALL 0x00000001
-+#define DDENUMSURFACES_MATCH 0x00000002
-+#define DDENUMSURFACES_NOMATCH 0x00000004
-+#define DDENUMSURFACES_CANBECREATED 0x00000008
-+#define DDENUMSURFACES_DOESEXIST 0x00000010
-+
-+/* SetDisplayMode flags */
-+#define DDSDM_STANDARDVGAMODE 0x00000001
-+
-+/* EnumDisplayModes flags */
-+#define DDEDM_REFRESHRATES 0x00000001
-+#define DDEDM_STANDARDVGAMODES 0x00000002
-+
-+/* WaitForVerticalDisplay flags */
-+
-+#define DDWAITVB_BLOCKBEGIN 0x00000001
-+#define DDWAITVB_BLOCKBEGINEVENT 0x00000002
-+#define DDWAITVB_BLOCKEND 0x00000004
-+
-+typedef struct _DDSURFACEDESC
-+{
-+ DWORD dwSize; /* 0: size of the DDSURFACEDESC structure*/
-+ DWORD dwFlags; /* 4: determines what fields are valid*/
-+ DWORD dwHeight; /* 8: height of surface to be created*/
-+ DWORD dwWidth; /* C: width of input surface*/
-+ union {
-+ LONG lPitch; /* 10: distance to start of next line (return value only)*/
-+ DWORD dwLinearSize;
-+ } DUMMYUNIONNAME;
-+ DWORD dwBackBufferCount;/* 14: number of back buffers requested*/
-+ union {
-+ DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/
-+ DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/
-+ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-+ } DUMMYUNIONNAME2;
-+ DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-+ DWORD dwReserved; /* 20:reserved*/
-+ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/
-+ DDCOLORKEY ddckCKDestOverlay;/* 28: CK for dest overlay use*/
-+ DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/
-+ DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-+ DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/
-+ DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/
-+ DDSCAPS ddsCaps; /* 68: direct draw surface caps */
-+} DDSURFACEDESC,*LPDDSURFACEDESC;
-+
-+typedef struct _DDSURFACEDESC2
-+{
-+ DWORD dwSize; /* 0: size of the DDSURFACEDESC2 structure*/
-+ DWORD dwFlags; /* 4: determines what fields are valid*/
-+ DWORD dwHeight; /* 8: height of surface to be created*/
-+ DWORD dwWidth; /* C: width of input surface*/
-+ union {
-+ LONG lPitch; /*10: distance to start of next line (return value only)*/
-+ DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */
-+ } DUMMYUNIONNAME;
-+ DWORD dwBackBufferCount;/* 14: number of back buffers requested*/
-+ union {
-+ DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/
-+ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-+ DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */
-+ } DUMMYUNIONNAME2;
-+ DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-+ DWORD dwReserved; /* 20:reserved*/
-+ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/
-+ union {
-+ DDCOLORKEY ddckCKDestOverlay; /* 28: CK for dest overlay use*/
-+ DWORD dwEmptyFaceColor; /* 28: color for empty cubemap faces */
-+ } DUMMYUNIONNAME3;
-+ DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/
-+ DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-+ DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/
-+
-+ union {
-+ DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/
-+ DWORD dwFVF; /* 48: vertex format description of vertex buffers */
-+ } DUMMYUNIONNAME4;
-+ DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */
-+ DWORD dwTextureStage; /* 78: stage in multitexture cascade */
-+} DDSURFACEDESC2,*LPDDSURFACEDESC2;
-+
-+/* DDCOLORCONTROL.dwFlags */
-+#define DDCOLOR_BRIGHTNESS 0x00000001
-+#define DDCOLOR_CONTRAST 0x00000002
-+#define DDCOLOR_HUE 0x00000004
-+#define DDCOLOR_SATURATION 0x00000008
-+#define DDCOLOR_SHARPNESS 0x00000010
-+#define DDCOLOR_GAMMA 0x00000020
-+#define DDCOLOR_COLORENABLE 0x00000040
-+
-+typedef struct {
-+ DWORD dwSize;
-+ DWORD dwFlags;
-+ LONG lBrightness;
-+ LONG lContrast;
-+ LONG lHue;
-+ LONG lSaturation;
-+ LONG lSharpness;
-+ LONG lGamma;
-+ LONG lColorEnable;
-+ DWORD dwReserved1;
-+} DDCOLORCONTROL,*LPDDCOLORCONTROL;
-+
-+typedef struct {
-+ WORD red[256];
-+ WORD green[256];
-+ WORD blue[256];
-+} DDGAMMARAMP,*LPDDGAMMARAMP;
-+
-+typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-+typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
-+/* DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) */
-+
-+typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
-+typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
-+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
-+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
-+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
-+
-+typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
-+typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
-+/* DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX) */
-+
-+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
-+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
-+/* #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) */
-+
-+HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
-+HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
-+/* #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx) */
-+
-+typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
-+typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
-+/* DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX) */
-+
-+/* flags for DirectDrawEnumerateEx */
-+#define DDENUM_ATTACHEDSECONDARYDEVICES 0x00000001
-+#define DDENUM_DETACHEDSECONDARYDEVICES 0x00000002
-+#define DDENUM_NONDISPLAYDEVICES 0x00000004
-+
-+/* flags for DirectDrawCreate or IDirectDraw::Initialize */
-+#define DDCREATE_HARDWAREONLY 1L
-+#define DDCREATE_EMULATIONONLY 2L
-+
-+typedef struct _DDBLTFX
-+{
-+ DWORD dwSize; /* size of structure */
-+ DWORD dwDDFX; /* FX operations */
-+ DWORD dwROP; /* Win32 raster operations */
-+ DWORD dwDDROP; /* Raster operations new for DirectDraw */
-+ DWORD dwRotationAngle; /* Rotation angle for blt */
-+ DWORD dwZBufferOpCode; /* ZBuffer compares */
-+ DWORD dwZBufferLow; /* Low limit of Z buffer */
-+ DWORD dwZBufferHigh; /* High limit of Z buffer */
-+ DWORD dwZBufferBaseDest; /* Destination base value */
-+ DWORD dwZDestConstBitDepth; /* Bit depth used to specify Z constant for destination */
-+ union
-+ {
-+ DWORD dwZDestConst; /* Constant to use as Z buffer for dest */
-+ LPDIRECTDRAWSURFACE lpDDSZBufferDest; /* Surface to use as Z buffer for dest */
-+ } DUMMYUNIONNAME;
-+ DWORD dwZSrcConstBitDepth; /* Bit depth used to specify Z constant for source */
-+ union
-+ {
-+ DWORD dwZSrcConst; /* Constant to use as Z buffer for src */
-+ LPDIRECTDRAWSURFACE lpDDSZBufferSrc; /* Surface to use as Z buffer for src */
-+ } DUMMYUNIONNAME2;
-+ DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
-+ DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */
-+ DWORD dwReserved;
-+ DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
-+ union
-+ {
-+ DWORD dwAlphaDestConst; /* Constant to use as Alpha Channel */
-+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */
-+ } DUMMYUNIONNAME3;
-+ DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
-+ union
-+ {
-+ DWORD dwAlphaSrcConst; /* Constant to use as Alpha Channel */
-+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as Alpha Channel */
-+ } DUMMYUNIONNAME4;
-+ union
-+ {
-+ DWORD dwFillColor; /* color in RGB or Palettized */
-+ DWORD dwFillDepth; /* depth value for z-buffer */
-+ DWORD dwFillPixel; /* pixel val for RGBA or RGBZ */
-+ LPDIRECTDRAWSURFACE lpDDSPattern; /* Surface to use as pattern */
-+ } DUMMYUNIONNAME5;
-+ DDCOLORKEY ddckDestColorkey; /* DestColorkey override */
-+ DDCOLORKEY ddckSrcColorkey; /* SrcColorkey override */
-+} DDBLTFX,*LPDDBLTFX;
-+
-+/* dwDDFX */
-+/* arithmetic stretching along y axis */
-+#define DDBLTFX_ARITHSTRETCHY 0x00000001
-+/* mirror on y axis */
-+#define DDBLTFX_MIRRORLEFTRIGHT 0x00000002
-+/* mirror on x axis */
-+#define DDBLTFX_MIRRORUPDOWN 0x00000004
-+/* do not tear */
-+#define DDBLTFX_NOTEARING 0x00000008
-+/* 180 degrees clockwise rotation */
-+#define DDBLTFX_ROTATE180 0x00000010
-+/* 270 degrees clockwise rotation */
-+#define DDBLTFX_ROTATE270 0x00000020
-+/* 90 degrees clockwise rotation */
-+#define DDBLTFX_ROTATE90 0x00000040
-+/* dwZBufferLow and dwZBufferHigh specify limits to the copied Z values */
-+#define DDBLTFX_ZBUFFERRANGE 0x00000080
-+/* add dwZBufferBaseDest to every source z value before compare */
-+#define DDBLTFX_ZBUFFERBASEDEST 0x00000100
-+
-+typedef struct _DDOVERLAYFX
-+{
-+ DWORD dwSize; /* size of structure */
-+ DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
-+ DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */
-+ DWORD dwReserved;
-+ DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
-+ union
-+ {
-+ DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */
-+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */
-+ } DUMMYUNIONNAME;
-+ DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
-+ union
-+ {
-+ DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */
-+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as alpha channel for src */
-+ } DUMMYUNIONNAME2;
-+ DDCOLORKEY dckDestColorkey; /* DestColorkey override */
-+ DDCOLORKEY dckSrcColorkey; /* DestColorkey override */
-+ DWORD dwDDFX; /* Overlay FX */
-+ DWORD dwFlags; /* flags */
-+} DDOVERLAYFX,*LPDDOVERLAYFX;
-+
-+typedef struct _DDBLTBATCH
-+{
-+ LPRECT lprDest;
-+ LPDIRECTDRAWSURFACE lpDDSSrc;
-+ LPRECT lprSrc;
-+ DWORD dwFlags;
-+ LPDDBLTFX lpDDBltFx;
-+} DDBLTBATCH,*LPDDBLTBATCH;
-+
-+#define MAX_DDDEVICEID_STRING 512
-+
-+#define DDGDI_GETHOSTIDENTIFIER 1
-+
-+typedef struct tagDDDEVICEIDENTIFIER {
-+ char szDriver[MAX_DDDEVICEID_STRING];
-+ char szDescription[MAX_DDDEVICEID_STRING];
-+ LARGE_INTEGER liDriverVersion;
-+ DWORD dwVendorId;
-+ DWORD dwDeviceId;
-+ DWORD dwSubSysId;
-+ DWORD dwRevision;
-+ GUID guidDeviceIdentifier;
-+} DDDEVICEIDENTIFIER, * LPDDDEVICEIDENTIFIER;
-+
-+typedef struct tagDDDEVICEIDENTIFIER2 {
-+ char szDriver[MAX_DDDEVICEID_STRING]; /* user readable driver name */
-+ char szDescription[MAX_DDDEVICEID_STRING]; /* user readable description */
-+ LARGE_INTEGER liDriverVersion; /* driver version */
-+ DWORD dwVendorId; /* vendor ID, zero if unknown */
-+ DWORD dwDeviceId; /* chipset ID, zero if unknown */
-+ DWORD dwSubSysId; /* board ID, zero if unknown */
-+ DWORD dwRevision; /* chipset version, zero if unknown */
-+ GUID guidDeviceIdentifier; /* unique ID for this driver/chipset combination */
-+ DWORD dwWHQLLevel; /* Windows Hardware Quality Lab certification level */
-+} DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
-+
-+/*****************************************************************************
-+ * IDirectDrawPalette interface
-+ */
-+#undef INTERFACE
-+#define INTERFACE IDirectDrawPalette
-+DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawPalette methods ***/
-+ STDMETHOD(GetCaps)(THIS_ LPDWORD lpdwCaps) PURE;
-+ STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE;
-+ STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawPalette_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawPalette_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawPalette_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawPalette methods ***/
-+#define IDirectDrawPalette_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawPalette_GetEntries(p,a,b,c,d) (p)->lpVtbl->GetEntries(p,a,b,c,d)
-+#define IDirectDrawPalette_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-+#define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->lpVtbl->SetEntries(p,a,b,c,d)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawPalette_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawPalette_AddRef(p) (p)->AddRef()
-+#define IDirectDrawPalette_Release(p) (p)->Release()
-+/*** IDirectDrawPalette methods ***/
-+#define IDirectDrawPalette_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawPalette_GetEntries(p,a,b,c,d) (p)->GetEntries(a,b,c,d)
-+#define IDirectDrawPalette_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
-+#define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->SetEntries(a,b,c,d)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawClipper interface
-+ */
-+#define INTERFACE IDirectDrawClipper
-+DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawClipper methods ***/
-+ STDMETHOD(GetClipList)(THIS_ LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) PURE;
-+ STDMETHOD(GetHWnd)(THIS_ HWND *lphWnd) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
-+ STDMETHOD(IsClipListChanged)(THIS_ BOOL *lpbChanged) PURE;
-+ STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
-+ STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawClipper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawClipper_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawClipper_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawClipper methods ***/
-+#define IDirectDrawClipper_GetClipList(p,a,b,c) (p)->lpVtbl->GetClipList(p,a,b,c)
-+#define IDirectDrawClipper_GetHWnd(p,a) (p)->lpVtbl->GetHWnd(p,a)
-+#define IDirectDrawClipper_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawClipper_IsClipListChanged(p,a) (p)->lpVtbl->IsClipListChanged(p,a)
-+#define IDirectDrawClipper_SetClipList(p,a,b) (p)->lpVtbl->SetClipList(p,a,b)
-+#define IDirectDrawClipper_SetHWnd(p,a,b) (p)->lpVtbl->SetHWnd(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawClipper_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawClipper_AddRef(p) (p)->AddRef()
-+#define IDirectDrawClipper_Release(p) (p)->Release()
-+/*** IDirectDrawClipper methods ***/
-+#define IDirectDrawClipper_GetClipList(p,a,b,c) (p)->GetClipList(a,b,c)
-+#define IDirectDrawClipper_GetHWnd(p,a) (p)->GetHWnd(a)
-+#define IDirectDrawClipper_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawClipper_IsClipListChanged(p,a) (p)->IsClipListChanged(a)
-+#define IDirectDrawClipper_SetClipList(p,a,b) (p)->SetClipList(a,b)
-+#define IDirectDrawClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDraw interface
-+ */
-+#define INTERFACE IDirectDraw
-+DECLARE_INTERFACE_(IDirectDraw,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDraw methods ***/
-+ STDMETHOD(Compact)(THIS) PURE;
-+ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
-+ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
-+ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
-+ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
-+ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
-+ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+ STDMETHOD(FlipToGDISurface)(THIS) PURE;
-+ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-+ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-+ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
-+ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-+ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-+ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
-+ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
-+ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-+ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) PURE;
-+ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDraw_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDraw_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDraw_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectDraw_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
-+#define IDirectDraw_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
-+#define IDirectDraw_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
-+#define IDirectDraw_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
-+#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
-+#define IDirectDraw_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
-+#define IDirectDraw_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
-+#define IDirectDraw_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
-+#define IDirectDraw_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
-+#define IDirectDraw_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
-+#define IDirectDraw_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
-+#define IDirectDraw_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
-+#define IDirectDraw_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
-+#define IDirectDraw_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
-+#define IDirectDraw_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#define IDirectDraw_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
-+#define IDirectDraw_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->lpVtbl->SetDisplayMode(p,a,b,c)
-+#define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDraw_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDraw_AddRef(p) (p)->AddRef()
-+#define IDirectDraw_Release(p) (p)->Release()
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw_Compact(p) (p)->Compact()
-+#define IDirectDraw_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
-+#define IDirectDraw_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
-+#define IDirectDraw_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
-+#define IDirectDraw_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
-+#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
-+#define IDirectDraw_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
-+#define IDirectDraw_FlipToGDISurface(p) (p)->FlipToGDISurface()
-+#define IDirectDraw_GetCaps(p,a,b) (p)->GetCaps(a,b)
-+#define IDirectDraw_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
-+#define IDirectDraw_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
-+#define IDirectDraw_GetGDISurface(p,a) (p)->GetGDISurface(a)
-+#define IDirectDraw_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
-+#define IDirectDraw_GetScanLine(p,a) (p)->GetScanLine(a)
-+#define IDirectDraw_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
-+#define IDirectDraw_Initialize(p,a) (p)->Initialize(a)
-+#define IDirectDraw_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
-+#define IDirectDraw_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->SetDisplayMode(a,b,c)
-+#define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
-+#endif
-+
-+
-+/* flags for Lock() */
-+#define DDLOCK_SURFACEMEMORYPTR 0x00000000
-+#define DDLOCK_WAIT 0x00000001
-+#define DDLOCK_EVENT 0x00000002
-+#define DDLOCK_READONLY 0x00000010
-+#define DDLOCK_WRITEONLY 0x00000020
-+#define DDLOCK_NOSYSLOCK 0x00000800
-+#define DDLOCK_NOOVERWRITE 0x00001000
-+#define DDLOCK_DISCARDCONTENTS 0x00002000
-+
-+
-+/*****************************************************************************
-+ * IDirectDraw2 interface
-+ */
-+/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of
-+ * arguments of SetDisplayMode has changed !
-+ */
-+#define INTERFACE IDirectDraw2
-+DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDraw2 methods ***/
-+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
-+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
-+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
-+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
-+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
-+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
-+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
-+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
-+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
-+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
-+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
-+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-+ /* added in v2 */
-+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDraw2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDraw2_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDraw2_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw2_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectDraw2_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
-+#define IDirectDraw2_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
-+#define IDirectDraw2_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
-+#define IDirectDraw2_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
-+#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
-+#define IDirectDraw2_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
-+#define IDirectDraw2_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
-+#define IDirectDraw2_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
-+#define IDirectDraw2_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
-+#define IDirectDraw2_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
-+#define IDirectDraw2_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
-+#define IDirectDraw2_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
-+#define IDirectDraw2_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
-+#define IDirectDraw2_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
-+#define IDirectDraw2_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#define IDirectDraw2_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
-+#define IDirectDraw2_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
-+#define IDirectDraw2_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDraw2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDraw2_AddRef(p) (p)->AddRef()
-+#define IDirectDraw2_Release(p) (p)->Release()
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw2_Compact(p) (p)->Compact()
-+#define IDirectDraw2_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
-+#define IDirectDraw2_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
-+#define IDirectDraw2_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
-+#define IDirectDraw2_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
-+#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
-+#define IDirectDraw2_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
-+#define IDirectDraw2_FlipToGDISurface(p) (p)->FlipToGDISurface()
-+#define IDirectDraw2_GetCaps(p,a,b) (p)->GetCaps(a,b)
-+#define IDirectDraw2_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
-+#define IDirectDraw2_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
-+#define IDirectDraw2_GetGDISurface(p,a) (p)->GetGDISurface(a)
-+#define IDirectDraw2_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
-+#define IDirectDraw2_GetScanLine(p,a) (p)->GetScanLine(a)
-+#define IDirectDraw2_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
-+#define IDirectDraw2_Initialize(p,a) (p)->Initialize(a)
-+#define IDirectDraw2_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
-+#define IDirectDraw2_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
-+#define IDirectDraw2_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDraw3 interface
-+ */
-+#define INTERFACE IDirectDraw3
-+DECLARE_INTERFACE_(IDirectDraw3,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDraw2 methods ***/
-+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
-+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
-+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
-+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
-+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
-+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
-+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
-+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
-+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
-+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
-+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
-+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-+ /* added in v2 */
-+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-+ /* added in v3 */
-+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
-+#define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
-+#define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
-+#define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
-+#define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
-+#define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
-+#define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
-+#define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
-+#define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
-+#define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
-+#define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
-+#define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
-+#define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
-+#define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
-+#define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
-+#define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
-+#define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
-+/*** IDirectDraw3 methods ***/
-+#define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDraw3_AddRef(p) (p)->AddRef()
-+#define IDirectDraw3_Release(p) (p)->Release()
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw3_Compact(p) (p)->Compact()
-+#define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
-+#define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
-+#define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
-+#define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
-+#define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
-+#define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
-+#define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface()
-+#define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b)
-+#define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
-+#define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
-+#define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a)
-+#define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
-+#define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a)
-+#define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
-+#define IDirectDraw3_Initialize(p,a) (p)->Initialize(a)
-+#define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
-+#define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
-+#define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
-+/*** IDirectDraw3 methods ***/
-+#define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDraw4 interface
-+ */
-+#define INTERFACE IDirectDraw4
-+DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDraw4 methods ***/
-+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
-+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
-+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
-+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4 *lplpDDSurface, IUnknown *pUnkOuter) PURE;
-+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4 *lplpDupDDSurface) PURE;
-+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE;
-+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE;
-+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
-+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4 *lplpGDIDDSurface) PURE;
-+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
-+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
-+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
-+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-+ /* added in v2 */
-+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-+ /* added in v4 */
-+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE4 *pSurf) PURE;
-+/*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
-+/*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE;
-+/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDraw4_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDraw4_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDraw4_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw4_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectDraw4_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
-+#define IDirectDraw4_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
-+#define IDirectDraw4_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
-+#define IDirectDraw4_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
-+#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
-+#define IDirectDraw4_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
-+#define IDirectDraw4_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
-+#define IDirectDraw4_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
-+#define IDirectDraw4_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
-+#define IDirectDraw4_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
-+#define IDirectDraw4_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
-+#define IDirectDraw4_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
-+#define IDirectDraw4_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
-+#define IDirectDraw4_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
-+#define IDirectDraw4_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#define IDirectDraw4_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
-+#define IDirectDraw4_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
-+#define IDirectDraw4_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
-+/*** IDirectDraw4 methods ***/
-+#define IDirectDraw4_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
-+#define IDirectDraw4_RestoreAllSurfaces(pc) (p)->lpVtbl->RestoreAllSurfaces(p)
-+#define IDirectDraw4_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p)
-+#define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->lpVtbl->GetDeviceIdentifier(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDraw4_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDraw4_AddRef(p) (p)->AddRef()
-+#define IDirectDraw4_Release(p) (p)->Release()
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw4_Compact(p) (p)->Compact()
-+#define IDirectDraw4_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
-+#define IDirectDraw4_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
-+#define IDirectDraw4_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
-+#define IDirectDraw4_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
-+#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
-+#define IDirectDraw4_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
-+#define IDirectDraw4_FlipToGDISurface(p) (p)->FlipToGDISurface()
-+#define IDirectDraw4_GetCaps(p,a,b) (p)->GetCaps(a,b)
-+#define IDirectDraw4_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
-+#define IDirectDraw4_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
-+#define IDirectDraw4_GetGDISurface(p,a) (p)->GetGDISurface(a)
-+#define IDirectDraw4_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
-+#define IDirectDraw4_GetScanLine(p,a) (p)->GetScanLine(a)
-+#define IDirectDraw4_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
-+#define IDirectDraw4_Initialize(p,a) (p)->Initialize(a)
-+#define IDirectDraw4_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
-+#define IDirectDraw4_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
-+#define IDirectDraw4_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
-+/*** IDirectDraw2 methods ***/
-+#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
-+/*** IDirectDraw4 methods ***/
-+#define IDirectDraw4_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
-+#define IDirectDraw4_RestoreAllSurfaces(pc) (p)->RestoreAllSurfaces()
-+#define IDirectDraw4_TestCooperativeLevel(p) (p)->TestCooperativeLevel()
-+#define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDraw7 interface
-+ */
-+/* Note: IDirectDraw7 cannot derive from IDirectDraw4; it is even documented
-+ * as not interchangeable with earlier DirectDraw interfaces.
-+ */
-+#define INTERFACE IDirectDraw7
-+DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDraw7 methods ***/
-+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
-+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
-+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
-+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE7 *lplpDDSurface, IUnknown *pUnkOuter) PURE;
-+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface, LPDIRECTDRAWSURFACE7 *lplpDupDDSurface) PURE;
-+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE;
-+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE;
-+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
-+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE7 *lplpGDIDDSurface) PURE;
-+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
-+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
-+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
-+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-+ /* added in v2 */
-+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-+ /* added in v4 */
-+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE7 *pSurf) PURE;
-+/*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
-+/*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE;
-+/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) PURE;
-+ /* added in v7 */
-+/*70*/ STDMETHOD(StartModeTest)(THIS_ LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) PURE;
-+/*74*/ STDMETHOD(EvaluateMode)(THIS_ DWORD dwFlags, DWORD *pTimeout) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDraw7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDraw7_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDraw7_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw7_Compact(p) (p)->lpVtbl->Compact(p)
-+#define IDirectDraw7_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
-+#define IDirectDraw7_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
-+#define IDirectDraw7_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
-+#define IDirectDraw7_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
-+#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
-+#define IDirectDraw7_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
-+#define IDirectDraw7_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
-+#define IDirectDraw7_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
-+#define IDirectDraw7_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
-+#define IDirectDraw7_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
-+#define IDirectDraw7_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
-+#define IDirectDraw7_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
-+#define IDirectDraw7_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
-+#define IDirectDraw7_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
-+#define IDirectDraw7_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-+#define IDirectDraw7_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
-+#define IDirectDraw7_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-+#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
-+#define IDirectDraw7_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
-+/*** added in IDirectDraw2 ***/
-+#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
-+/*** added in IDirectDraw4 ***/
-+#define IDirectDraw7_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
-+#define IDirectDraw7_RestoreAllSurfaces(p) (p)->lpVtbl->RestoreAllSurfaces(p)
-+#define IDirectDraw7_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p)
-+#define IDirectDraw7_GetDeviceIdentifier(p,a,b) (p)->lpVtbl->GetDeviceIdentifier(p,a,b)
-+/*** added in IDirectDraw 7 ***/
-+#define IDirectDraw7_StartModeTest(p,a,b,c) (p)->lpVtbl->StartModeTest(p,a,b,c)
-+#define IDirectDraw7_EvaluateMode(p,a,b) (p)->lpVtbl->EvaluateMode(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDraw7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDraw7_AddRef(p) (p)->AddRef()
-+#define IDirectDraw7_Release(p) (p)->Release()
-+/*** IDirectDraw methods ***/
-+#define IDirectDraw7_Compact(p) (p)->Compact()
-+#define IDirectDraw7_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
-+#define IDirectDraw7_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
-+#define IDirectDraw7_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
-+#define IDirectDraw7_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
-+#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
-+#define IDirectDraw7_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
-+#define IDirectDraw7_FlipToGDISurface(p) (p)->FlipToGDISurface()
-+#define IDirectDraw7_GetCaps(p,a,b) (p)->GetCaps(a,b)
-+#define IDirectDraw7_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
-+#define IDirectDraw7_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
-+#define IDirectDraw7_GetGDISurface(p,a) (p)->GetGDISurface(a)
-+#define IDirectDraw7_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
-+#define IDirectDraw7_GetScanLine(p,a) (p)->GetScanLine(a)
-+#define IDirectDraw7_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
-+#define IDirectDraw7_Initialize(p,a) (p)->Initialize(a)
-+#define IDirectDraw7_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
-+#define IDirectDraw7_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
-+#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
-+#define IDirectDraw7_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
-+/*** added in IDirectDraw2 ***/
-+#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
-+/*** added in IDirectDraw4 ***/
-+#define IDirectDraw7_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
-+#define IDirectDraw7_RestoreAllSurfaces(p) (p)->RestoreAllSurfaces()
-+#define IDirectDraw7_TestCooperativeLevel(p) (p)->TestCooperativeLevel()
-+#define IDirectDraw7_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
-+/*** added in IDirectDraw 7 ***/
-+#define IDirectDraw7_StartModeTest(p,a,b,c) (p)->StartModeTest(a,b,c)
-+#define IDirectDraw7_EvaluateMode(p,a,b) (p)->EvaluateMode(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawSurface interface
-+ */
-+#define INTERFACE IDirectDrawSurface
-+DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawSurface methods ***/
-+/*0c*/ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE;
-+/*10*/ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
-+/*14*/ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-+/*18*/ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
-+/*1c*/ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
-+/*20*/ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE;
-+/*24*/ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+/*28*/ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
-+/*2c*/ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
-+/*30*/ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE *lplpDDAttachedSurface) PURE;
-+/*34*/ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
-+/*38*/ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
-+/*3c*/ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
-+/*40*/ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+/*44*/ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
-+/*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
-+/*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
-+/*50*/ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
-+/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-+/*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+/*5c*/ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+/*60*/ STDMETHOD(IsLost)(THIS) PURE;
-+/*64*/ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
-+/*68*/ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
-+/*6c*/ STDMETHOD(Restore)(THIS) PURE;
-+/*70*/ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-+/*74*/ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+/*78*/ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
-+/*7c*/ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-+/*80*/ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
-+/*84*/ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
-+/*88*/ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
-+/*8c*/ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSReference) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawSurface_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawSurface_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawSurface methods ***/
-+#define IDirectDrawSurface_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
-+#define IDirectDrawSurface_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-+#define IDirectDrawSurface_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
-+#define IDirectDrawSurface_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
-+#define IDirectDrawSurface_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-+#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-+#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-+#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-+#define IDirectDrawSurface_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
-+#define IDirectDrawSurface_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
-+#define IDirectDrawSurface_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
-+#define IDirectDrawSurface_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawSurface_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
-+#define IDirectDrawSurface_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
-+#define IDirectDrawSurface_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
-+#define IDirectDrawSurface_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
-+#define IDirectDrawSurface_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
-+#define IDirectDrawSurface_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
-+#define IDirectDrawSurface_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
-+#define IDirectDrawSurface_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawSurface_IsLost(p) (p)->lpVtbl->IsLost(p)
-+#define IDirectDrawSurface_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
-+#define IDirectDrawSurface_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
-+#define IDirectDrawSurface_Restore(p) (p)->lpVtbl->Restore(p)
-+#define IDirectDrawSurface_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
-+#define IDirectDrawSurface_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
-+#define IDirectDrawSurface_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
-+#define IDirectDrawSurface_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
-+#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-+#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-+#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawSurface_AddRef(p) (p)->AddRef()
-+#define IDirectDrawSurface_Release(p) (p)->Release()
-+/*** IDirectDrawSurface methods ***/
-+#define IDirectDrawSurface_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
-+#define IDirectDrawSurface_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
-+#define IDirectDrawSurface_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
-+#define IDirectDrawSurface_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
-+#define IDirectDrawSurface_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
-+#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
-+#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
-+#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
-+#define IDirectDrawSurface_Flip(p,a,b) (p)->Flip(a,b)
-+#define IDirectDrawSurface_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
-+#define IDirectDrawSurface_GetBltStatus(p,a) (p)->GetBltStatus(a)
-+#define IDirectDrawSurface_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawSurface_GetClipper(p,a) (p)->GetClipper(a)
-+#define IDirectDrawSurface_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
-+#define IDirectDrawSurface_GetDC(p,a) (p)->GetDC(a)
-+#define IDirectDrawSurface_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
-+#define IDirectDrawSurface_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
-+#define IDirectDrawSurface_GetPalette(p,a) (p)->GetPalette(a)
-+#define IDirectDrawSurface_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
-+#define IDirectDrawSurface_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
-+#define IDirectDrawSurface_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawSurface_IsLost(p) (p)->IsLost()
-+#define IDirectDrawSurface_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
-+#define IDirectDrawSurface_ReleaseDC(p,a) (p)->ReleaseDC(a)
-+#define IDirectDrawSurface_Restore(p) (p)->Restore()
-+#define IDirectDrawSurface_SetClipper(p,a) (p)->SetClipper(a)
-+#define IDirectDrawSurface_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
-+#define IDirectDrawSurface_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
-+#define IDirectDrawSurface_SetPalette(p,a) (p)->SetPalette(a)
-+#define IDirectDrawSurface_Unlock(p,a) (p)->Unlock(a)
-+#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
-+#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
-+#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawSurface2 interface
-+ */
-+/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters
-+ * have been converted to LPDIRECTDRAWSURFACE2.
-+ */
-+#define INTERFACE IDirectDrawSurface2
-+DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawSurface2 methods ***/
-+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
-+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
-+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
-+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
-+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
-+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2 *lplpDDAttachedSurface) PURE;
-+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
-+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
-+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
-+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
-+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
-+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+ STDMETHOD(IsLost)(THIS) PURE;
-+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
-+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
-+ STDMETHOD(Restore)(THIS) PURE;
-+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
-+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-+ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
-+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
-+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE;
-+ /* added in v2 */
-+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
-+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawSurface2_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawSurface2_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawSurface methods (almost) ***/
-+#define IDirectDrawSurface2_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
-+#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-+#define IDirectDrawSurface2_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
-+#define IDirectDrawSurface2_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
-+#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-+#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-+#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-+#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-+#define IDirectDrawSurface2_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
-+#define IDirectDrawSurface2_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
-+#define IDirectDrawSurface2_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
-+#define IDirectDrawSurface2_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawSurface2_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
-+#define IDirectDrawSurface2_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
-+#define IDirectDrawSurface2_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
-+#define IDirectDrawSurface2_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
-+#define IDirectDrawSurface2_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface2_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
-+#define IDirectDrawSurface2_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
-+#define IDirectDrawSurface2_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
-+#define IDirectDrawSurface2_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawSurface2_IsLost(p) (p)->lpVtbl->IsLost(p)
-+#define IDirectDrawSurface2_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
-+#define IDirectDrawSurface2_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
-+#define IDirectDrawSurface2_Restore(p) (p)->lpVtbl->Restore(p)
-+#define IDirectDrawSurface2_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
-+#define IDirectDrawSurface2_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
-+#define IDirectDrawSurface2_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface2_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
-+#define IDirectDrawSurface2_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
-+#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-+#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-+#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface2_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
-+#define IDirectDrawSurface2_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
-+#define IDirectDrawSurface2_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawSurface2_AddRef(p) (p)->AddRef()
-+#define IDirectDrawSurface2_Release(p) (p)->Release()
-+/*** IDirectDrawSurface methods (almost) ***/
-+#define IDirectDrawSurface2_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
-+#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
-+#define IDirectDrawSurface2_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
-+#define IDirectDrawSurface2_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
-+#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
-+#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
-+#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
-+#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
-+#define IDirectDrawSurface2_Flip(p,a,b) (p)->Flip(a,b)
-+#define IDirectDrawSurface2_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
-+#define IDirectDrawSurface2_GetBltStatus(p,a) (p)->GetBltStatus(a)
-+#define IDirectDrawSurface2_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawSurface2_GetClipper(p,a) (p)->GetClipper(a)
-+#define IDirectDrawSurface2_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
-+#define IDirectDrawSurface2_GetDC(p,a) (p)->GetDC(a)
-+#define IDirectDrawSurface2_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
-+#define IDirectDrawSurface2_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
-+#define IDirectDrawSurface2_GetPalette(p,a) (p)->GetPalette(a)
-+#define IDirectDrawSurface2_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
-+#define IDirectDrawSurface2_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
-+#define IDirectDrawSurface2_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawSurface2_IsLost(p) (p)->IsLost()
-+#define IDirectDrawSurface2_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
-+#define IDirectDrawSurface2_ReleaseDC(p,a) (p)->ReleaseDC(a)
-+#define IDirectDrawSurface2_Restore(p) (p)->Restore()
-+#define IDirectDrawSurface2_SetClipper(p,a) (p)->SetClipper(a)
-+#define IDirectDrawSurface2_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
-+#define IDirectDrawSurface2_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
-+#define IDirectDrawSurface2_SetPalette(p,a) (p)->SetPalette(a)
-+#define IDirectDrawSurface2_Unlock(p,a) (p)->Unlock(a)
-+#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
-+#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
-+#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface2_GetDDInterface(p,a) (p)->GetDDInterface(a)
-+#define IDirectDrawSurface2_PageLock(p,a) (p)->PageLock(a)
-+#define IDirectDrawSurface2_PageUnlock(p,a) (p)->PageUnlock(a)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawSurface3 interface
-+ */
-+/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters
-+ * have been converted to LPDIRECTDRAWSURFACE3.
-+ */
-+#define INTERFACE IDirectDrawSurface3
-+DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawSurface3 methods ***/
-+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
-+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
-+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
-+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
-+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
-+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3 *lplpDDAttachedSurface) PURE;
-+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
-+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
-+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
-+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
-+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
-+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-+ STDMETHOD(IsLost)(THIS) PURE;
-+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
-+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
-+ STDMETHOD(Restore)(THIS) PURE;
-+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
-+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-+ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
-+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
-+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE;
-+ /* added in v2 */
-+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
-+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-+ /* added in v3 */
-+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawSurface3_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawSurface3_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawSurface methods (almost) ***/
-+#define IDirectDrawSurface3_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
-+#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-+#define IDirectDrawSurface3_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
-+#define IDirectDrawSurface3_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
-+#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-+#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-+#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-+#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-+#define IDirectDrawSurface3_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
-+#define IDirectDrawSurface3_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
-+#define IDirectDrawSurface3_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
-+#define IDirectDrawSurface3_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawSurface3_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
-+#define IDirectDrawSurface3_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
-+#define IDirectDrawSurface3_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
-+#define IDirectDrawSurface3_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
-+#define IDirectDrawSurface3_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface3_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
-+#define IDirectDrawSurface3_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
-+#define IDirectDrawSurface3_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
-+#define IDirectDrawSurface3_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawSurface3_IsLost(p) (p)->lpVtbl->IsLost(p)
-+#define IDirectDrawSurface3_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
-+#define IDirectDrawSurface3_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
-+#define IDirectDrawSurface3_Restore(p) (p)->lpVtbl->Restore(p)
-+#define IDirectDrawSurface3_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
-+#define IDirectDrawSurface3_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
-+#define IDirectDrawSurface3_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface3_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
-+#define IDirectDrawSurface3_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
-+#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-+#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-+#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface3_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
-+#define IDirectDrawSurface3_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
-+#define IDirectDrawSurface3_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawSurface3_AddRef(p) (p)->AddRef()
-+#define IDirectDrawSurface3_Release(p) (p)->Release()
-+/*** IDirectDrawSurface methods (almost) ***/
-+#define IDirectDrawSurface3_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
-+#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
-+#define IDirectDrawSurface3_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
-+#define IDirectDrawSurface3_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
-+#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
-+#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
-+#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
-+#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
-+#define IDirectDrawSurface3_Flip(p,a,b) (p)->Flip(a,b)
-+#define IDirectDrawSurface3_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
-+#define IDirectDrawSurface3_GetBltStatus(p,a) (p)->GetBltStatus(a)
-+#define IDirectDrawSurface3_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawSurface3_GetClipper(p,a) (p)->GetClipper(a)
-+#define IDirectDrawSurface3_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
-+#define IDirectDrawSurface3_GetDC(p,a) (p)->GetDC(a)
-+#define IDirectDrawSurface3_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
-+#define IDirectDrawSurface3_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
-+#define IDirectDrawSurface3_GetPalette(p,a) (p)->GetPalette(a)
-+#define IDirectDrawSurface3_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
-+#define IDirectDrawSurface3_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
-+#define IDirectDrawSurface3_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawSurface3_IsLost(p) (p)->IsLost()
-+#define IDirectDrawSurface3_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
-+#define IDirectDrawSurface3_ReleaseDC(p,a) (p)->ReleaseDC(a)
-+#define IDirectDrawSurface3_Restore(p) (p)->Restore()
-+#define IDirectDrawSurface3_SetClipper(p,a) (p)->SetClipper(a)
-+#define IDirectDrawSurface3_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
-+#define IDirectDrawSurface3_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
-+#define IDirectDrawSurface3_SetPalette(p,a) (p)->SetPalette(a)
-+#define IDirectDrawSurface3_Unlock(p,a) (p)->Unlock(a)
-+#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
-+#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
-+#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface3_GetDDInterface(p,a) (p)->GetDDInterface(a)
-+#define IDirectDrawSurface3_PageLock(p,a) (p)->PageLock(a)
-+#define IDirectDrawSurface3_PageUnlock(p,a) (p)->PageUnlock(a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawSurface4 interface
-+ */
-+/* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
-+ */
-+#define INTERFACE IDirectDrawSurface4
-+DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawSurface4 methods ***/
-+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
-+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
-+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
-+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
-+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
-+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE;
-+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
-+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
-+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
-+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
-+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
-+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+ STDMETHOD(IsLost)(THIS) PURE;
-+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
-+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
-+ STDMETHOD(Restore)(THIS) PURE;
-+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
-+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-+ STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
-+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
-+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE;
-+ /* added in v2 */
-+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
-+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-+ /* added in v3 */
-+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE;
-+ /* added in v4 */
-+ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE;
-+ STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE;
-+ STDMETHOD(FreePrivateData)(THIS_ REFGUID tag) PURE;
-+ STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD pValue) PURE;
-+ STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface4_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawSurface4_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawSurface4_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawSurface (almost) methods ***/
-+#define IDirectDrawSurface4_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
-+#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-+#define IDirectDrawSurface4_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
-+#define IDirectDrawSurface4_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
-+#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-+#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-+#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-+#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-+#define IDirectDrawSurface4_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
-+#define IDirectDrawSurface4_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
-+#define IDirectDrawSurface4_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
-+#define IDirectDrawSurface4_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawSurface4_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
-+#define IDirectDrawSurface4_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
-+#define IDirectDrawSurface4_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
-+#define IDirectDrawSurface4_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
-+#define IDirectDrawSurface4_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface4_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
-+#define IDirectDrawSurface4_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
-+#define IDirectDrawSurface4_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
-+#define IDirectDrawSurface4_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawSurface4_IsLost(p) (p)->lpVtbl->IsLost(p)
-+#define IDirectDrawSurface4_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
-+#define IDirectDrawSurface4_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
-+#define IDirectDrawSurface4_Restore(p) (p)->lpVtbl->Restore(p)
-+#define IDirectDrawSurface4_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
-+#define IDirectDrawSurface4_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
-+#define IDirectDrawSurface4_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface4_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
-+#define IDirectDrawSurface4_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
-+#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-+#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-+#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface4_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
-+#define IDirectDrawSurface4_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
-+#define IDirectDrawSurface4_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
-+/*** IDirectDrawSurface4 methods ***/
-+#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
-+#define IDirectDrawSurface4_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
-+#define IDirectDrawSurface4_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
-+#define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->lpVtbl->GetUniquenessValue(p,a)
-+#define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->lpVtbl->ChangeUniquenessValue(p)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface4_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawSurface4_AddRef(p) (p)->AddRef()
-+#define IDirectDrawSurface4_Release(p) (p)->Release()
-+/*** IDirectDrawSurface (almost) methods ***/
-+#define IDirectDrawSurface4_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
-+#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
-+#define IDirectDrawSurface4_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
-+#define IDirectDrawSurface4_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
-+#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
-+#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
-+#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
-+#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
-+#define IDirectDrawSurface4_Flip(p,a,b) (p)->Flip(a,b)
-+#define IDirectDrawSurface4_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
-+#define IDirectDrawSurface4_GetBltStatus(p,a) (p)->GetBltStatus(a)
-+#define IDirectDrawSurface4_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawSurface4_GetClipper(p,a) (p)->GetClipper(a)
-+#define IDirectDrawSurface4_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
-+#define IDirectDrawSurface4_GetDC(p,a) (p)->GetDC(a)
-+#define IDirectDrawSurface4_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
-+#define IDirectDrawSurface4_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
-+#define IDirectDrawSurface4_GetPalette(p,a) (p)->GetPalette(a)
-+#define IDirectDrawSurface4_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
-+#define IDirectDrawSurface4_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
-+#define IDirectDrawSurface4_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawSurface4_IsLost(p) (p)->IsLost()
-+#define IDirectDrawSurface4_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
-+#define IDirectDrawSurface4_ReleaseDC(p,a) (p)->ReleaseDC(a)
-+#define IDirectDrawSurface4_Restore(p) (p)->Restore()
-+#define IDirectDrawSurface4_SetClipper(p,a) (p)->SetClipper(a)
-+#define IDirectDrawSurface4_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
-+#define IDirectDrawSurface4_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
-+#define IDirectDrawSurface4_SetPalette(p,a) (p)->SetPalette(a)
-+#define IDirectDrawSurface4_Unlock(p,a) (p)->Unlock(a)
-+#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
-+#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
-+#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface4_GetDDInterface(p,a) (p)->GetDDInterface(a)
-+#define IDirectDrawSurface4_PageLock(p,a) (p)->PageLock(a)
-+#define IDirectDrawSurface4_PageUnlock(p,a) (p)->PageUnlock(a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
-+/*** IDirectDrawSurface4 methods ***/
-+#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) (p)->SetPrivateData(a,b,c,d)
-+#define IDirectDrawSurface4_GetPrivateData(p,a,b,c) (p)->GetPrivateData(a,b,c)
-+#define IDirectDrawSurface4_FreePrivateData(p,a) (p)->FreePrivateData(a)
-+#define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a)
-+#define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue()
-+#endif
-+
-+
-+/*****************************************************************************
-+ * IDirectDrawSurface7 interface
-+ */
-+#define INTERFACE IDirectDrawSurface7
-+DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawSurface7 methods ***/
-+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
-+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
-+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
-+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE;
-+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE;
-+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpfnCallback) PURE;
-+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
-+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE7 *lplpDDAttachedSurface) PURE;
-+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
-+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
-+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
-+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
-+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
-+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-+ STDMETHOD(IsLost)(THIS) PURE;
-+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
-+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
-+ STDMETHOD(Restore)(THIS) PURE;
-+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
-+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
-+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-+ STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
-+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE7 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
-+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSReference) PURE;
-+ /* added in v2 */
-+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
-+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
-+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-+ /* added in v3 */
-+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE;
-+ /* added in v4 */
-+ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE;
-+ STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE;
-+ STDMETHOD(FreePrivateData)(THIS_ REFGUID tag) PURE;
-+ STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD pValue) PURE;
-+ STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
-+ /* added in v7 */
-+ STDMETHOD(SetPriority)(THIS_ DWORD prio) PURE;
-+ STDMETHOD(GetPriority)(THIS_ LPDWORD prio) PURE;
-+ STDMETHOD(SetLOD)(THIS_ DWORD lod) PURE;
-+ STDMETHOD(GetLOD)(THIS_ LPDWORD lod) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawSurface7_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawSurface7_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawSurface (almost) methods ***/
-+#define IDirectDrawSurface7_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
-+#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-+#define IDirectDrawSurface7_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
-+#define IDirectDrawSurface7_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
-+#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-+#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-+#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-+#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-+#define IDirectDrawSurface7_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
-+#define IDirectDrawSurface7_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
-+#define IDirectDrawSurface7_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
-+#define IDirectDrawSurface7_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
-+#define IDirectDrawSurface7_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
-+#define IDirectDrawSurface7_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
-+#define IDirectDrawSurface7_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
-+#define IDirectDrawSurface7_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
-+#define IDirectDrawSurface7_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface7_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
-+#define IDirectDrawSurface7_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
-+#define IDirectDrawSurface7_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
-+#define IDirectDrawSurface7_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-+#define IDirectDrawSurface7_IsLost(p) (p)->lpVtbl->IsLost(p)
-+#define IDirectDrawSurface7_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
-+#define IDirectDrawSurface7_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
-+#define IDirectDrawSurface7_Restore(p) (p)->lpVtbl->Restore(p)
-+#define IDirectDrawSurface7_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
-+#define IDirectDrawSurface7_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
-+#define IDirectDrawSurface7_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
-+#define IDirectDrawSurface7_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
-+#define IDirectDrawSurface7_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
-+#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-+#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-+#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface7_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
-+#define IDirectDrawSurface7_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
-+#define IDirectDrawSurface7_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
-+/*** IDirectDrawSurface4 methods ***/
-+#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
-+#define IDirectDrawSurface7_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
-+#define IDirectDrawSurface7_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
-+#define IDirectDrawSurface7_GetUniquenessValue(p,a) (p)->lpVtbl->GetUniquenessValue(p,a)
-+#define IDirectDrawSurface7_ChangeUniquenessValue(p) (p)->lpVtbl->ChangeUniquenessValue(p)
-+/*** IDirectDrawSurface7 methods ***/
-+#define IDirectDrawSurface7_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a)
-+#define IDirectDrawSurface7_GetPriority(p,a) (p)->lpVtbl->GetPriority(p,a)
-+#define IDirectDrawSurface7_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a)
-+#define IDirectDrawSurface7_GetLOD(p,a) (p)->lpVtbl->GetLOD(p,a)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawSurface7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawSurface7_AddRef(p) (p)->AddRef()
-+#define IDirectDrawSurface7_Release(p) (p)->Release()
-+/*** IDirectDrawSurface (almost) methods ***/
-+#define IDirectDrawSurface7_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
-+#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
-+#define IDirectDrawSurface7_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
-+#define IDirectDrawSurface7_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
-+#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
-+#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
-+#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
-+#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
-+#define IDirectDrawSurface7_Flip(p,a,b) (p)->Flip(a,b)
-+#define IDirectDrawSurface7_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
-+#define IDirectDrawSurface7_GetBltStatus(p,a) (p)->GetBltStatus(a)
-+#define IDirectDrawSurface7_GetCaps(p,a) (p)->GetCaps(a)
-+#define IDirectDrawSurface7_GetClipper(p,a) (p)->GetClipper(a)
-+#define IDirectDrawSurface7_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
-+#define IDirectDrawSurface7_GetDC(p,a) (p)->GetDC(a)
-+#define IDirectDrawSurface7_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
-+#define IDirectDrawSurface7_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
-+#define IDirectDrawSurface7_GetPalette(p,a) (p)->GetPalette(a)
-+#define IDirectDrawSurface7_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
-+#define IDirectDrawSurface7_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
-+#define IDirectDrawSurface7_Initialize(p,a,b) (p)->Initialize(a,b)
-+#define IDirectDrawSurface7_IsLost(p) (p)->IsLost()
-+#define IDirectDrawSurface7_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
-+#define IDirectDrawSurface7_ReleaseDC(p,a) (p)->ReleaseDC(a)
-+#define IDirectDrawSurface7_Restore(p) (p)->Restore()
-+#define IDirectDrawSurface7_SetClipper(p,a) (p)->SetClipper(a)
-+#define IDirectDrawSurface7_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
-+#define IDirectDrawSurface7_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
-+#define IDirectDrawSurface7_SetPalette(p,a) (p)->SetPalette(a)
-+#define IDirectDrawSurface7_Unlock(p,a) (p)->Unlock(a)
-+#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
-+#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
-+#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
-+/*** IDirectDrawSurface2 methods ***/
-+#define IDirectDrawSurface7_GetDDInterface(p,a) (p)->GetDDInterface(a)
-+#define IDirectDrawSurface7_PageLock(p,a) (p)->PageLock(a)
-+#define IDirectDrawSurface7_PageUnlock(p,a) (p)->PageUnlock(a)
-+/*** IDirectDrawSurface3 methods ***/
-+#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
-+/*** IDirectDrawSurface4 methods ***/
-+#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) (p)->SetPrivateData(a,b,c,d)
-+#define IDirectDrawSurface7_GetPrivateData(p,a,b,c) (p)->GetPrivateData(a,b,c)
-+#define IDirectDrawSurface7_FreePrivateData(p,a) (p)->FreePrivateData(a)
-+#define IDirectDrawSurface7_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a)
-+#define IDirectDrawSurface7_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue()
-+/*** IDirectDrawSurface7 methods ***/
-+#define IDirectDrawSurface7_SetPriority(p,a) (p)->SetPriority(a)
-+#define IDirectDrawSurface7_GetPriority(p,a) (p)->GetPriority(a)
-+#define IDirectDrawSurface7_SetLOD(p,a) (p)->SetLOD(a)
-+#define IDirectDrawSurface7_GetLOD(p,a) (p)->GetLOD(a)
-+#endif
-+
-+/*****************************************************************************
-+ * IDirectDrawColorControl interface
-+ */
-+#define INTERFACE IDirectDrawColorControl
-+DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawColorControl methods ***/
-+ STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
-+ STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawColorControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawColorControl_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawColorControl_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawColorControl methods ***/
-+#define IDirectDrawColorControl_GetColorControls(p,a) (p)->lpVtbl->GetColorControls(p,a)
-+#define IDirectDrawColorControl_SetColorControls(p,a) (p)->lpVtbl->SetColorControls(p,a)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawColorControl_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawColorControl_AddRef(p) (p)->AddRef()
-+#define IDirectDrawColorControl_Release(p) (p)->Release()
-+/*** IDirectDrawColorControl methods ***/
-+#define IDirectDrawColorControl_GetColorControls(p,a) (p)->GetColorControls(a)
-+#define IDirectDrawColorControl_SetColorControls(p,a) (p)->SetColorControls(a)
-+#endif
-+
-+/*****************************************************************************
-+ * IDirectDrawGammaControl interface
-+ */
-+#define INTERFACE IDirectDrawGammaControl
-+DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
-+{
-+ /*** IUnknown methods ***/
-+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+ STDMETHOD_(ULONG,Release)(THIS) PURE;
-+ /*** IDirectDrawGammaControl methods ***/
-+ STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
-+ STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
-+};
-+#undef INTERFACE
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirectDrawGammaControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirectDrawGammaControl_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirectDrawGammaControl_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirectDrawGammaControl methods ***/
-+#define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b)
-+#define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirectDrawGammaControl_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirectDrawGammaControl_AddRef(p) (p)->AddRef()
-+#define IDirectDrawGammaControl_Release(p) (p)->Release()
-+/*** IDirectDrawGammaControl methods ***/
-+#define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->GetGammaRamp(a,b)
-+#define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->SetGammaRamp(a,b)
-+#endif
-+
-+
-+HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*);
-+HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*);
-+HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
-+
-+#ifdef __cplusplus
-+} /* extern "C" */
-+#endif /* defined(__cplusplus) */
-+
-+#endif /* __WINE_DDRAW_H */
-diff -ruN a/include/dmodshow.h b/include/dmodshow.h
---- a/include/dmodshow.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/dmodshow.h 2009-03-09 16:54:08.000000000 +0100
-@@ -0,0 +1,23 @@
-+#ifndef _MODSHOW_H
-+#define _MODSHOW_H
-+#if __GNUC__ >= 3
-+#pragma GCC system_header
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);
-+EXTERN_C const IID IID_IDMOWrapperFilter;
-+
-+#define INTERFACE IDMOWrapperFilter
-+DECLARE_INTERFACE_(IDMOWrapperFilter, IUnknown)
-+{
-+ STDMETHOD(Init)(THIS_ REFCLSID, REFCLSID) PURE;
-+};
-+#undef INTERFACE
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -ruN a/include/dmo.h b/include/dmo.h
---- a/include/dmo.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/dmo.h 2009-03-09 16:49:50.000000000 +0100
-@@ -0,0 +1,46 @@
-+#ifndef _DMO_H
-+#define _DMO_H
-+
-+#if __GNUC__ >= 3
-+#pragma GCC system_header
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+typedef struct _DMO_PARTIAL_MEDIATYPE {
-+ GUID type;
-+ GUID subtype;
-+} DMO_PARTIAL_MEDIATYPE;
-+
-+typedef enum {
-+ DMO_ENUMF_INCLUDE_KEYED = 0x00000001
-+} DMO_ENUM_FLAGS;
-+
-+DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb);
-+DECLARE_INTERFACE(IEnumDMO);
-+
-+typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;
-+STDAPI DMOEnum(REFGUID, DWORD, DWORD, const DMO_PARTIAL_MEDIATYPE *, DWORD, const DMO_PARTIAL_MEDIATYPE *,
-+ IEnumDMO **);
-+STDAPI DMOGetName(REFCLSID, WCHAR [80]);
-+
-+
-+#define INTERFACE IEnumDMO
-+DECLARE_INTERFACE_(IEnumDMO, IUnknown)
-+{
-+ STDMETHOD(Next)(THIS_ DWORD, CLSID *, WCHAR **, DWORD *) PURE;
-+ STDMETHOD(Skip)(THIS_ DWORD) PURE;
-+ STDMETHOD(Reset)(THIS) PURE;
-+ STDMETHOD(Clone)(THIS_ IEnumDMO **) PURE;
-+};
-+#undef INTERFACE
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif //_DMO_H
-\ No newline at end of file
-diff -ruN a/include/dshow.h b/include/dshow.h
---- a/include/dshow.h 2009-11-21 06:31:44.000000000 +0100
-+++ b/include/dshow.h 2010-04-25 20:35:52.184124176 +0200
-@@ -5,7 +5,10 @@
- #endif
-
- #include
-+#ifdef DSHOW_USE_AMAUDIO
- #include
-+#endif
-+#include
- #include
- #include
- #include
-@@ -50,10 +53,6 @@
- AM_WST_STATE_Off = 0,
- AM_WST_STATE_On
- } AM_WST_STATE,*PAM_WST_STATE;
--typedef enum _AM_WST_STYLE {
-- AM_WST_STYLE_None = 0,
-- AM_WST_STYLE_Invers
--} AM_WST_STYLE,*PAM_WST_STYLE;
- typedef enum {
- AM_EXSEEK_CANSEEK= 1,
- AM_EXSEEK_CANSCAN = 2,
-@@ -63,6 +62,10 @@
- AM_EXSEEK_BUFFERING = 32,
- AM_EXSEEK_SENDS_VIDEOFRAMEREADY = 64
- } AMExtendedSeekingCapabilities;
-+typedef enum _AM_WST_STYLE {
-+ AM_WST_STYLE_None = 0,
-+ AM_WST_STYLE_Invers
-+} AM_WST_STYLE,*PAM_WST_STYLE;
- /*--- DirectShow Reference - DirectShow Structures */
- typedef struct _AM_WST_PAGE {
- DWORD dwPageNr;
-diff -ruN a/include/medparam.h b/include/medparam.h
---- a/include/medparam.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/medparam.h 2009-03-09 16:55:56.000000000 +0100
-@@ -0,0 +1,88 @@
-+#ifndef _MEDPARAM_H
-+#define _MEDPARAM_H
-+#if __GNUC__ >= 3
-+#pragma GCC system_header
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define MP_CAPS_CURVE_INVSQUARE ( MP_CURVE_INVSQUARE )
-+
-+/* typedefs */
-+typedef DWORD MP_CAPS;
-+typedef float MP_DATA;
-+typedef DWORD MP_TIMEDATA;
-+typedef DWORD MP_FLAGS;
-+
-+
-+/* enum */
-+typedef
-+enum _MP_CURVE_TYPE {
-+ MP_CURVE_JUMP = 0x1,
-+ MP_CURVE_LINEAR = 0x2,
-+ MP_CURVE_SQUARE = 0x4,
-+ MP_CURVE_INVSQUARE = 0x8,
-+ MP_CURVE_SINE = 0x10
-+} MP_CURVE_TYPE;
-+
-+typedef
-+enum _MP_Type {
-+ MPT_INT = 0,
-+ MPT_FLOAT = ( MPT_INT + 1 ) ,
-+ MPT_BOOL = ( MPT_FLOAT + 1 ) ,
-+ MPT_ENUM = ( MPT_BOOL + 1 ) ,
-+ MPT_MAX = ( MPT_ENUM + 1 )
-+} MP_TYPE;
-+
-+/* structs */
-+
-+typedef struct _MP_PARAMINFO {
-+ MP_TYPE mpType;
-+ MP_CAPS mopCaps;
-+ MP_DATA mpdMinValue;
-+ MP_DATA mpdMaxValue;
-+ MP_DATA mpdNeutralValue;
-+ WCHAR szUnitText[32];
-+ WCHAR szLabel[32];
-+} MP_PARAMINFO;
-+
-+typedef struct _MP_ENVELOPE_SEGMENT {
-+ REFERENCE_TIME rtStart;
-+ REFERENCE_TIME rtEnd;
-+ MP_DATA valStart;
-+ MP_DATA valEnd;
-+ MP_CURVE_TYPE iCurve;
-+ MP_FLAGS flags;
-+} MP_ENVELOPE_SEGMENT;
-+
-+/* interfaces */
-+EXTERN_C const IID IID_IMediaParamInfo;
-+EXTERN_C const IID IID_IMediaParams;
-+
-+#define INTERFACE IMediaParamInfo
-+DECLARE_INTERFACE_(IMediaParamInfo, IUnknown)
-+{
-+ STDMETHOD(GetParamCount)(THIS_ DWORD *) PURE;
-+ STDMETHOD(GetParamInfo)(THIS_ DWORD, MP_PARAMINFO *) PURE;
-+ STDMETHOD(GetParamText)(THIS_ DWORD, WCHAR **) PURE;
-+ STDMETHOD(GetNumTimeFormats)(THIS_ DWORD *) PURE;
-+ STDMETHOD(GetSupportedTimeFormat)(THIS_ DWORD, GUID *) PURE;
-+ STDMETHOD(GetCurrentTimeFormat)(THIS_ GUID *, MP_TIMEDATA *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaParams
-+DECLARE_INTERFACE_(IMediaParams, IUnknown)
-+{
-+ STDMETHOD(GetParam)(THIS_ DWORD, MP_DATA *) PURE;
-+ STDMETHOD(SetParam)(THIS_ DWORD, MP_DATA) PURE;
-+ STDMETHOD(AddEnvelope)(THIS_ DWORD, DWORD, MP_ENVELOPE_SEGMENT *) PURE;
-+ STDMETHOD(FlushEnvelope)(THIS_ DWORD, REFERENCE_TIME, REFERENCE_TIME) PURE;
-+ STDMETHOD(SetTimeFormat)(THIS_ GUID, MP_TIMEDATA) PURE;
-+};
-+#undef INTERFACE
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -ruN a/include/qnetwork.h b/include/qnetwork.h
---- a/include/qnetwork.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/qnetwork.h 2009-03-09 16:15:46.000000000 +0100
-@@ -0,0 +1,49 @@
-+#ifndef _QNETWORK_H
-+#define _QNETWORK_H
-+
-+#if __GNUC__ >= 3
-+#pragma GCC system_header
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+DEFINE_GUID(IID_IAMMediaContent,0xFA2AA8F4L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00);
-+DEFINE_GUID(IID_IAMNetworkStatus,0xFA2AA8F3L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00);
-+
-+#define INTERFACE IAMMediaContent
-+DECLARE_INTERFACE_(IAMMediaContent, IDispatch)
-+{
-+ STDMETHOD(get_AuthorName)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_Title)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_Rating)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_Description)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_Copyright)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_BaseURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_LogoURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_LogoIconURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_WatermarkURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_MoreInfoURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_MoreInfoBannerImage)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_MoreInfoBannerURL)(THIS_ BSTR*) PURE;
-+ STDMETHOD(get_MoreInfoText)(THIS_ BSTR*) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE(IAMNetworkStatus)
-+DECLARE_INTERFACE_(IAMNetworkStatus, IDispatch)
-+{
-+ STDMETHOD(get_ReceivedPackets)(THIS_ long*) PURE;
-+ STDMETHOD(get_RecoveredPackets)(THIS_ long*) PURE;
-+ STDMETHOD(get_LostPackets)(THIS_ long*) PURE;
-+ STDMETHOD(get_ReceptionQuality)(THIS_ long*) PURE;
-+ STDMETHOD(get_BufferingCount)(THIS_ long*) PURE;
-+ STDMETHOD(get_IsBroadcast)(THIS_ VARIANT_BOOL*) PURE;
-+ STDMETHOD(get_BufferingProgress)(THIS_ long*) PURE;
-+};
-+#undef INTERFACE
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif //_QNETWORK_H
-\ No newline at end of file
-diff -ruN a/include/strmif.h b/include/strmif.h
---- a/include/strmif.h 2009-11-21 06:31:55.000000000 +0100
-+++ b/include/strmif.h 2010-04-25 20:35:52.184124176 +0200
-@@ -4,10 +4,79 @@
- #pragma GCC system_header
- #endif
-
-+#include
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-
-+#define MAX_FILTER_NAME 128
-+#define AM_GBF_NOTASYNCPOINT 2
-+
-+/*--- DirectShow Reference - Forward declarations of Interfaces and typedefs */
-+typedef DWORD_PTR HEVENT;
-+typedef DWORD_PTR HSEMAPHORE;
-+DECLARE_INTERFACE(IBaseFilter);
-+DECLARE_INTERFACE(IPin);
-+DECLARE_INTERFACE(IFilterGraph);
-+DECLARE_INTERFACE(IEnumFilters);
-+EXTERN_C const IID IID_IBaseFilter;
-+EXTERN_C const IID IID_ICreateDevEnum;
-+EXTERN_C const IID IID_IGraphBuilder;
-+EXTERN_C const IID IID_IMediaSeeking;
-+EXTERN_C const IID IID_IMediaEventSink;
-+EXTERN_C const IID IID_IMemInputPin;
-+EXTERN_C const IID IID_IEnumPins;
-+EXTERN_C const IID IID_IMediaFilter;
-+EXTERN_C const IID IID_IEnumMediaTypes;
-+EXTERN_C const IID IID_IMemAllocator;
-+EXTERN_C const IID IID_IPin;
-+EXTERN_C const IID IID_IAsyncReader;
-+
-+/* class ids*/
-+DEFINE_GUID(CLSID_AudioRender,
-+0xe30629d1, 0x27e5, 0x11ce, 0x87, 0x5d, 0x0, 0x60, 0x8c, 0xb7, 0x80, 0x66);
-+DEFINE_GUID(CLSID_SystemDeviceEnum,
-+0x62BE5D10,0x60EB,0x11d0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86);
-+DEFINE_GUID(CLSID_AudioRendererCategory,
-+0xe0f158e1, 0xcb04, 0x11d0, 0xbd, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0xce, 0x86);
-+DEFINE_GUID(CLSID_FilterGraph,
-+0xe436ebb3, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+DEFINE_GUID(CLSID_InfTee,
-+0xf8388a40, 0xd5bb, 0x11d0, 0xbe, 0x5a, 0x0, 0x80, 0xc7, 0x6, 0x56, 0x8e);
-+DEFINE_GUID(CLSID_VideoMixingRenderer9,
-+0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a);
-+DEFINE_GUID(CLSID_MemoryAllocator,
-+0x1e651cc0, 0xb199, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);
-+
-+/*other types*/
-+DEFINE_GUID(MEDIATYPE_Audio,
-+0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-+DEFINE_GUID(MEDIATYPE_Video,
-+0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-+DEFINE_GUID(MEDIATYPE_Stream,
-+0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+DEFINE_GUID(MEDIASUBTYPE_PCM,
-+0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-+DEFINE_GUID(MEDIASUBTYPE_WAVE,
-+0xe436eb8b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+DEFINE_GUID(MEDIASUBTYPE_Avi,
-+0xe436eb88, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+DEFINE_GUID(MEDIASUBTYPE_RGB32,
-+0xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
-+DEFINE_GUID(MEDIASUBTYPE_YV12,
-+0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-+DEFINE_GUID(MEDIASUBTYPE_YUY2,
-+0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-+DEFINE_GUID(FORMAT_WaveFormatEx,
-+0x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a);
-+DEFINE_GUID(FORMAT_VideoInfo,
-+0x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a);
-+DEFINE_GUID(FORMAT_VideoInfo2,
-+0xf72a76A0, 0xeb0a, 0x11d0, 0xac, 0xe4, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba);
-+#define MEDIATYPE_NULL GUID_NULL
-+#define MEDIASUBTYPE_NULL GUID_NULL
-+
- /*--- DirectShow Reference - DirectShow Enumerated Types - TVAudioMode Enumeration */
- #define TVAUDIO_MODE_MASK 0x000000FF
- #define TVAUDIO_PRESET_MASK 0x0000FF00
-@@ -24,6 +93,18 @@
- MERIT_HW_COMPRESSOR = 0x100050
- };
- /*--- DirectShow Reference - DirectShow Enumerated Types */
-+typedef
-+enum AM_SEEKING_SeekingFlags {
-+ AM_SEEKING_NoPositioning = 0,
-+ AM_SEEKING_AbsolutePositioning = 0x1,
-+ AM_SEEKING_RelativePositioning = 0x2,
-+ AM_SEEKING_IncrementalPositioning = 0x3,
-+ AM_SEEKING_PositioningBitsMask = 0x3,
-+ AM_SEEKING_SeekToKeyFrame = 0x4,
-+ AM_SEEKING_ReturnTime = 0x8,
-+ AM_SEEKING_Segment = 0x10,
-+ AM_SEEKING_NoFlush = 0x20
-+} AM_SEEKING_SEEKING_FLAGS;
- typedef enum _AM_AUDIO_RENDERER_STAT_PARAM {
- AM_AUDREND_STAT_PARAM_BREAK_COUNT = 1,
- AM_AUDREND_STAT_PARAM_SLAVE_MODE,
-@@ -452,7 +533,7 @@
- Famine,
- Flood
- } QualityMessageType;
--enum {
-+typedef enum {
- REG_PINFLAG_B_ZERO = 0x1,
- REG_PINFLAG_B_RENDERER = 0x2,
- REG_PINFLAG_B_MANY = 0x4,
-@@ -613,6 +694,10 @@
- AMAP_DXVA_TARGET = 0x20
- } VMRSurfaceAllocationFlags;
- /*--- DirectShow Reference - DirectShow Structures */
-+typedef struct _FilterInfo {
-+ WCHAR achName[128];
-+ IFilterGraph *pGraph;
-+} FILTER_INFO;
- typedef struct _AllocatorProperties {
- long cBuffers;
- long cbBuffer;
-@@ -731,10 +816,6 @@
- #define CK_NOCOLORKEY 0x00000000
- #define CK_INDEX 0x00000001
- #define CK_RGB 0x00000002
--typedef struct {
-- DWORD dw1;
-- DWORD dw2;
--} DDCOLORKEY;
- typedef struct tagDVD_AudioAttributes {
- DVD_AUDIO_APPMODE AppMode;
- DVD_AUDIO_FORMAT AudioFormat;
-@@ -848,7 +929,7 @@
- BOOL fIsSourceLetterboxed;
- BOOL fIsFilmMode;
- } DVD_VideoAttributes;
--struct tagDVD_MenuAttributes {
-+typedef struct tagDVD_MenuAttributes {
- BOOL fCompatibleRegion[8];
- DVD_VideoAttributes VideoAttributes;
- BOOL fAudioPresent;
-@@ -1024,7 +1105,7 @@
- } VMRFrequency;
- typedef struct tagVMRGUID {
- GUID *pGUID;
-- GUID GUID;
-+ GUID _GUID;
- } VMRGUID;
- typedef struct tagVMRMONITORINFO {
- VMRGUID guid;
-@@ -1074,15 +1155,15 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,get_AvailableTVFormats)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,get_HorizontalLocked)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,get_NumberOfLines)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,get_OutputEnable)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,get_TVFormat)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,get_VCRHorizontalLocking)(THIS_ long*) PURE;
-- STDMETHOD_(HRESULT,put_OutputEnable)(THIS_ long) PURE;
-- STDMETHOD_(HRESULT,put_TVFormat)(THIS_ long) PURE;
-- STDMETHOD_(HRESULT,put_VCRHorizontalLocking)(THIS_ long) PURE;
-+ STDMETHOD(get_AvailableTVFormats)(THIS_ long*) PURE;
-+ STDMETHOD(get_HorizontalLocked)(THIS_ long*) PURE;
-+ STDMETHOD(get_NumberOfLines)(THIS_ long*) PURE;
-+ STDMETHOD(get_OutputEnable)(THIS_ long*) PURE;
-+ STDMETHOD(get_TVFormat)(THIS_ long*) PURE;
-+ STDMETHOD(get_VCRHorizontalLocking)(THIS_ long*) PURE;
-+ STDMETHOD(put_OutputEnable)(THIS_ long) PURE;
-+ STDMETHOD(put_TVFormat)(THIS_ long) PURE;
-+ STDMETHOD(put_VCRHorizontalLocking)(THIS_ long) PURE;
- };
- #undef INTERFACE
- #define INTERFACE IAMAudioInputMixer
-@@ -1091,22 +1172,22 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,get_Bass)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,get_BassRange)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,get_Enable)(THIS_ BOOL*) PURE;
-- STDMETHOD_(HRESULT,get_Loudness)(THIS_ BOOL*) PURE;
-- STDMETHOD_(HRESULT,get_MixLevel)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,get_Mono)(THIS_ BOOL*) PURE;
-- STDMETHOD_(HRESULT,get_Pan)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,get_Treble)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,get_TrebleRange)(THIS_ double*) PURE;
-- STDMETHOD_(HRESULT,put_Bass)(THIS_ double) PURE;
-- STDMETHOD_(HRESULT,put_Enable)(THIS_ BOOL) PURE;
-- STDMETHOD_(HRESULT,put_Loudness)(THIS_ BOOL) PURE;
-- STDMETHOD_(HRESULT,put_MixLevel)(THIS_ double) PURE;
-- STDMETHOD_(HRESULT,put_Mono)(THIS_ BOOL) PURE;
-- STDMETHOD_(HRESULT,put_Pan)(THIS_ double) PURE;
-- STDMETHOD_(HRESULT,put_Treble)(THIS_ double) PURE;
-+ STDMETHOD(get_Bass)(THIS_ double*) PURE;
-+ STDMETHOD(get_BassRange)(THIS_ double*) PURE;
-+ STDMETHOD(get_Enable)(THIS_ BOOL*) PURE;
-+ STDMETHOD(get_Loudness)(THIS_ BOOL*) PURE;
-+ STDMETHOD(get_MixLevel)(THIS_ double*) PURE;
-+ STDMETHOD(get_Mono)(THIS_ BOOL*) PURE;
-+ STDMETHOD(get_Pan)(THIS_ double*) PURE;
-+ STDMETHOD(get_Treble)(THIS_ double*) PURE;
-+ STDMETHOD(get_TrebleRange)(THIS_ double*) PURE;
-+ STDMETHOD(put_Bass)(THIS_ double) PURE;
-+ STDMETHOD(put_Enable)(THIS_ BOOL) PURE;
-+ STDMETHOD(put_Loudness)(THIS_ BOOL) PURE;
-+ STDMETHOD(put_MixLevel)(THIS_ double) PURE;
-+ STDMETHOD(put_Mono)(THIS_ BOOL) PURE;
-+ STDMETHOD(put_Pan)(THIS_ double) PURE;
-+ STDMETHOD(put_Treble)(THIS_ double) PURE;
- };
- #undef INTERFACE
- #define INTERFACE IAMAudioRendererStats
-@@ -1115,7 +1196,7 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE;
-+ STDMETHOD(GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE;
- };
- #undef INTERFACE
- #define INTERFACE IAMBufferNegotiation
-@@ -1124,8 +1205,8 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE;
-- STDMETHOD_(HRESULT,SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE;
-+ STDMETHOD(GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE;
-+ STDMETHOD(SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE;
- };
- #undef INTERFACE
- #define INTERFACE IAMCameraControl
-@@ -1134,9 +1215,9 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,Get)(THIS_ long,long*,long*) PURE;
-- STDMETHOD_(HRESULT,GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE;
-- STDMETHOD_(HRESULT,Set)(THIS_ long,long,long) PURE;
-+ STDMETHOD(Get)(THIS_ long,long*,long*) PURE;
-+ STDMETHOD(GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE;
-+ STDMETHOD(Set)(THIS_ long,long,long) PURE;
- };
- #undef INTERFACE
-
-@@ -1146,13 +1227,205 @@
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-- STDMETHOD_(HRESULT,KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE;
-- STDMETHOD_(HRESULT,ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE;
-- STDMETHOD_(HRESULT,ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE;
-- STDMETHOD_(HRESULT,SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE;
-+ STDMETHOD(KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE;
-+ STDMETHOD(ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE;
-+ STDMETHOD(ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE;
-+ STDMETHOD(SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IFilterGraph
-+DECLARE_INTERFACE_(IFilterGraph ,IUnknown)
-+{
-+ STDMETHOD(AddFilter)(THIS_ IBaseFilter *, LPCWSTR) PURE;
-+ STDMETHOD(RemoveFilter)(THIS_ IBaseFilter *) PURE;
-+ STDMETHOD(EnumFilters)(THIS_ IEnumFilters **) PURE;
-+ STDMETHOD(FindFilterByName)(THIS_ LPCWSTR, IBaseFilter **) PURE;
-+ STDMETHOD(ConnectDirect)(THIS_ IPin *, IPin *, const AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(Reconnect)(THIS_ IPin *) PURE;
-+ STDMETHOD(Disconnect)(THIS_ IPin *) PURE;
-+ STDMETHOD(SetDefaultSyncSource)(THIS) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IGraphBuilder
-+DECLARE_INTERFACE_(IGraphBuilder ,IFilterGraph)
-+{
-+ STDMETHOD(Connect)(THIS_ IPin *, IPin *) PURE;
-+ STDMETHOD(Render)(THIS_ IPin *) PURE;
-+ STDMETHOD(RenderFile)(THIS_ LPCWSTR, LPCWSTR) PURE;
-+ STDMETHOD(AddSourceFilter)(THIS_ LPCWSTR, LPCWSTR, IBaseFilter **) PURE;
-+ STDMETHOD(SetLogFile)(THIS_ DWORD_PTR) PURE;
-+ STDMETHOD(Abort)(THIS) PURE;
-+ STDMETHOD(ShouldOperationContinue)(THIS) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IReferenceClock
-+DECLARE_INTERFACE_(IReferenceClock, IUnknown)
-+{
-+ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *) PURE;
-+ STDMETHOD(AdviseTime)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HEVENT, DWORD_PTR *) PURE;
-+ STDMETHOD(AdvisePeriodic)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HSEMAPHORE, DWORD_PTR *) PURE;
-+ STDMETHOD(Unadvise)(THIS_ DWORD_PTR) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IEnumFilters
-+DECLARE_INTERFACE_(IEnumFilters, IUnknown)
-+{
-+ STDMETHOD(Next)(THIS_ ULONG, IBaseFilter **, ULONG *) PURE;
-+ STDMETHOD(Skip)(THIS_ ULONG) PURE;
-+ STDMETHOD(Reset)(THIS) PURE;
-+ STDMETHOD(Clone)(THIS_ IEnumFilters **) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IEnumMediaTypes
-+DECLARE_INTERFACE_(IEnumMediaTypes, IUnknown)
-+{
-+ STDMETHOD(Next)(THIS_ ULONG, AM_MEDIA_TYPE **, ULONG *) PURE;
-+ STDMETHOD(Skip)(THIS_ ULONG) PURE;
-+ STDMETHOD(Reset)(THIS) PURE;
-+ STDMETHOD(Clone)(THIS_ IEnumMediaTypes **) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IEnumPins
-+DECLARE_INTERFACE_(IEnumPins, IUnknown)
-+{
-+ STDMETHOD(Next)(THIS_ ULONG, IPin **, ULONG *) PURE;
-+ STDMETHOD(Skip)(THIS_ ULONG) PURE;
-+ STDMETHOD(Reset)(THIS) PURE;
-+ STDMETHOD(Clone)(THIS_ IEnumPins **) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IPin
-+DECLARE_INTERFACE_(IPin, IUnknown)
-+{
-+ STDMETHOD(Connect)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(ReceiveConnection)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(Disconnect)(THIS) PURE;
-+ STDMETHOD(ConnectedTo)(THIS_ IPin **) PURE;
-+ STDMETHOD(ConnectionMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(QueryPinInfo)(THIS_ PIN_INFO *) PURE;
-+ STDMETHOD(QueryDirection)(THIS_ PIN_DIRECTION *) PURE;
-+ STDMETHOD(QueryId)(THIS_ LPWSTR *) PURE;
-+ STDMETHOD(QueryAccept)(THIS_ const AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(EnumMediaTypes)(THIS_ IEnumMediaTypes **) PURE;
-+ STDMETHOD(QueryInternalConnections)(THIS_ IPin **, ULONG *) PURE;
-+ STDMETHOD(EndOfStream)(THIS) PURE;
-+ STDMETHOD(BeginFlush)(THIS) PURE;
-+ STDMETHOD(EndFlush)(THIS) PURE;
-+ STDMETHOD(NewSegment)(THIS_ REFERENCE_TIME, REFERENCE_TIME, double) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaFilter
-+DECLARE_INTERFACE_(IMediaFilter, IPersist)
-+{
-+ STDMETHOD(Stop)(THIS) PURE;
-+ STDMETHOD(Pause)(THIS) PURE;
-+ STDMETHOD(Run)(THIS_ REFERENCE_TIME) PURE;
-+ STDMETHOD(GetState)(THIS_ DWORD, FILTER_STATE *) PURE;
-+ STDMETHOD(SetSyncSource)(THIS_ IReferenceClock *) PURE;
-+ STDMETHOD(GetSyncSource)(THIS_ IReferenceClock **) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IBaseFilter
-+DECLARE_INTERFACE_(IBaseFilter, IMediaFilter)
-+{
-+ STDMETHOD(EnumPins)(THIS_ IEnumPins **) PURE;
-+ STDMETHOD(FindPin)(THIS_ LPCWSTR, IPin **) PURE;
-+ STDMETHOD(QueryFilterInfo)(THIS_ FILTER_INFO *) PURE;
-+ STDMETHOD(JoinFilterGraph)(THIS_ IFilterGraph *, LPCWSTR) PURE;
-+ STDMETHOD(QueryVendorInfo)(THIS_ LPWSTR *) PURE;
- };
- #undef INTERFACE
-+#define INTERFACE IMediaSeeking
-+DECLARE_INTERFACE_(IMediaSeeking, IUnknown)
-+{
-+ STDMETHOD(GetCapabilities)(THIS_ DWORD *) PURE;
-+ STDMETHOD(CheckCapabilities)(THIS_ DWORD *) PURE;
-+ STDMETHOD(IsFormatSupported)(THIS_ const GUID *) PURE;
-+ STDMETHOD(QueryPreferredFormat)(THIS_ GUID *) PURE;
-+ STDMETHOD(GetTimeFormat)(THIS_ GUID *) PURE;
-+ STDMETHOD(IsUsingTimeFormat)(THIS_ const GUID *) PURE;
-+ STDMETHOD(SetTimeFormat)(THIS_ const GUID *) PURE;
-+ STDMETHOD(GetDuration)(THIS_ LONGLONG *) PURE;
-+ STDMETHOD(GetStopPosition)(THIS_ LONGLONG *) PURE;
-+ STDMETHOD(GetCurrentPosition)(THIS_ LONGLONG *) PURE;
-+ STDMETHOD(ConvertTimeFormat)(THIS_ LONGLONG *, const GUID *, LONGLONG, const GUID *) PURE;
-+ STDMETHOD(SetPositions)(THIS_ LONGLONG *, DWORD, LONGLONG *, DWORD) PURE;
-+ STDMETHOD(GetPositions)(THIS_ LONGLONG *,LONGLONG *) PURE;
-+ STDMETHOD(GetAvailable)(THIS_ LONGLONG *, LONGLONG *) PURE;
-+ STDMETHOD(SetRate)(THIS_ double) PURE;
-+ STDMETHOD(GetRate)(THIS_ double *) PURE;
-+ STDMETHOD(GetPreroll)(THIS_ LONGLONG *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE ICreateDevEnum
-+DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
-+{
-+ STDMETHOD(CreateClassEnumerator)(THIS_ REFCLSID, IEnumMoniker **, DWORD) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaSample
-+DECLARE_INTERFACE_(IMediaSample, IUnknown)
-+{
-+ STDMETHOD(GetPointer)(THIS_ BYTE **) PURE;
-+ STDMETHOD_(long, GetSize)(THIS) PURE;
-+ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE;
-+ STDMETHOD(SetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE;
-+ STDMETHOD(IsSyncPoint)(THIS) PURE;
-+ STDMETHOD(SetSyncPoint)(THIS_ BOOL) PURE;
-+ STDMETHOD(IsPreroll)(THIS) PURE;
-+ STDMETHOD(SetPreroll)(THIS_ BOOL) PURE;
-+ STDMETHOD_(long, GetActualDataLength)(THIS) PURE;
-+ STDMETHOD(SetActualDataLength)(THIS_ long) PURE;
-+ STDMETHOD(GetMediaType)(THIS_ AM_MEDIA_TYPE **) PURE;
-+ STDMETHOD(SetMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
-+ STDMETHOD(IsDiscontinuity)(THIS) PURE;
-+ STDMETHOD(SetDiscontinuity)(THIS_ BOOL) PURE;
-+ STDMETHOD(GetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE;
-+ STDMETHOD(SetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMemAllocator
-+DECLARE_INTERFACE_(IMemAllocator, IUnknown)
-+{
-+ STDMETHOD(SetProperties)(THIS_ ALLOCATOR_PROPERTIES *, ALLOCATOR_PROPERTIES *) PURE;
-+ STDMETHOD(GetProperties)(THIS_ ALLOCATOR_PROPERTIES *) PURE;
-+ STDMETHOD(Commit)(THIS) PURE;
-+ STDMETHOD(Decommit)(THIS) PURE;
-+ STDMETHOD(GetBuffer)(THIS_ IMediaSample **, REFERENCE_TIME *, REFERENCE_TIME *, DWORD) PURE;
-+ STDMETHOD(ReleaseBuffer)(THIS_ IMediaSample *) PURE;
-
-+};
-+#undef INTERFACE
-+#define INTERFACE IAsyncReader
-+DECLARE_INTERFACE_(IAsyncReader, IUnknown)
-+{
-+ STDMETHOD(RequestAllocator)(THIS_ IMemAllocator *, ALLOCATOR_PROPERTIES *, IMemAllocator **) PURE;
-+ STDMETHOD(Request)(THIS_ IMediaSample *, DWORD_PTR) PURE;
-+ STDMETHOD(WaitForNext)(THIS_ DWORD, IMediaSample **, DWORD_PTR *) PURE;
-+ STDMETHOD(SyncReadAligned)(THIS_ IMediaSample *) PURE;
-+ STDMETHOD(SyncRead)(THIS_ LONGLONG, LONG, BYTE *) PURE;
-+ STDMETHOD(Length)(THIS_ LONGLONG *, LONGLONG *) PURE;
-+ STDMETHOD(BeginFlush)(THIS) PURE;
-+ STDMETHOD(EndFlush)(THIS) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMediaEventSink
-+DECLARE_INTERFACE_(IMediaEventSink, IUnknown)
-+{
-+ STDMETHOD(Notify)(THIS_ long, LONG_PTR, LONG_PTR) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IMemInputPin
-+DECLARE_INTERFACE_(IMemInputPin, IUnknown)
-+{
-+ STDMETHOD(GetAllocator)(THIS_ IMemAllocator **) PURE;
-+ STDMETHOD(NotifyAllocator)(THIS_ IMemAllocator *, BOOL) PURE;
-+ STDMETHOD(GetAllocatorRequirements)(THIS_ ALLOCATOR_PROPERTIES *) PURE;
-+ STDMETHOD(Receive)(THIS_ IMediaSample *) PURE;
-+ STDMETHOD(ReceiveMultiple)(THIS_ IMediaSample **, long, long *) PURE;
-+ STDMETHOD(ReceiveCanBlock)(THIS) PURE;
-+};
-+#undef INTERFACE
- #ifdef __cplusplus
- }
- #endif
-diff -ruN a/include/vmr9.h b/include/vmr9.h
---- a/include/vmr9.h 2009-11-21 06:31:55.000000000 +0100
-+++ b/include/vmr9.h 2010-04-25 20:35:52.187132398 +0200
-@@ -8,6 +8,10 @@
- extern "C" {
- #endif
-
-+EXTERN_C const IID IID_IVMRFilterConfig9;
-+EXTERN_C const IID IID_IVMRWindowlessControl9;
-+EXTERN_C const IID IID_IVMRMixerControl9;
-+
- /*--- DirectShow Reference - DirectShow Enumerated Types */
- typedef enum _VMR9_SampleFormat {
- VMR9_SampleReserved = 1,
-@@ -61,7 +65,7 @@
- MixerPref9_RenderTargetRGB = 0x00001000,
- MixerPref9_RenderTargetYUV = 0x00002000,
- MixerPref9_RenderTargetReserved = 0x000FC000,
-- MixerPref9_RenderTargetMask = 0x000FF000
-+ MixerPref9_RenderTargetMask = 0x000FF000,
- MixerPref9_DynamicSwitchToBOB = 0x00100000,
- MixerPref9_DynamicDecimateBy2 = 0x00200000,
- MixerPref9_DynamicReserved = 0x00C00000,
-@@ -128,7 +132,7 @@
- HMONITOR hMon;
- DWORD dwFlags;
- wchar_t szDevice[32];
-- wchar_t szDescription[512]
-+ wchar_t szDescription[512];
- LARGE_INTEGER liDriverVersion;
- DWORD dwVendorId;
- DWORD dwDeviceId;
-@@ -181,7 +185,6 @@
- VMR9Frequency InputSampleFreq;
- VMR9Frequency OutputFrameFreq;
- } VMR9VideoDesc;
--/**********
- typedef struct VMR9VideoStreamInfo{
- IDirect3DSurface9 *pddsVideoSurface;
- DWORD dwWidth;
-@@ -203,8 +206,64 @@
- COLORREF clrSrcKey;
- DWORD dwFilterMode;
- };
--**********/
--
-+#define INTERFACE IVMRImageCompositor9
-+DECLARE_INTERFACE_(IVMRImageCompositor9, IUnknown)
-+{
-+ STDMETHOD(InitCompositionDevice)(THIS_ IUnknown *) PURE;
-+ STDMETHOD(TermCompositionDevice)(THIS_ IUnknown *) PURE;
-+ STDMETHOD(SetStreamMediaType)(THIS_ DWORD, AM_MEDIA_TYPE *, BOOL) PURE;
-+ STDMETHOD(CompositeImage)(THIS_ IUnknown *, IDirect3DSurface9 *, AM_MEDIA_TYPE *,
-+ REFERENCE_TIME, REFERENCE_TIME, D3DCOLOR, VMR9VideoStreamInfo *, UINT) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IVMRFilterConfig9
-+DECLARE_INTERFACE_(IVMRFilterConfig9, IUnknown)
-+{
-+ STDMETHOD(SetImageCompositor)(THIS_ IVMRImageCompositor9 *) PURE;
-+ STDMETHOD(SetNumberOfStreams)(THIS_ DWORD) PURE;
-+ STDMETHOD(GetNumberOfStreams)(THIS_ DWORD *) PURE;
-+ STDMETHOD(SetRenderingPrefs)(THIS_ DWORD) PURE;
-+ STDMETHOD(GetRenderingPrefs)(THIS_ DWORD *) PURE;
-+ STDMETHOD(SetRenderingMode)(THIS_ DWORD) PURE;
-+ STDMETHOD(GetRenderingMode)(THIS_ DWORD *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IVMRWindowlessControl9
-+DECLARE_INTERFACE_(IVMRWindowlessControl9, IUnknown)
-+{
-+ STDMETHOD(GetNativeVideoSize)(THIS_ LONG *, LONG *, LONG *, LONG *) PURE;
-+ STDMETHOD(GetMinIdealVideoSize)(THIS_ LONG *, LONG *) PURE;
-+ STDMETHOD(GetMaxIdealVideoSize)(THIS_ LONG *, LONG *) PURE;
-+ STDMETHOD(SetVideoPosition)(THIS_ const LPRECT, const LPRECT) PURE;
-+ STDMETHOD(GetVideoPosition)(THIS_ LPRECT, LPRECT) PURE;
-+ STDMETHOD(GetAspectRatioMode)(THIS_ DWORD *) PURE;
-+ STDMETHOD(SetAspectRatioMode)(THIS_ DWORD) PURE;
-+ STDMETHOD(SetVideoClippingWindow)(THIS_ HWND) PURE;
-+ STDMETHOD(RepaintVideo)(THIS_ HWND, HDC) PURE;
-+ STDMETHOD(DisplayModeChanged)(THIS) PURE;
-+ STDMETHOD(GetCurrentImage)(THIS_ BYTE **) PURE;
-+ STDMETHOD(SetBorderColor)(THIS_ COLORREF) PURE;
-+ STDMETHOD(GetBorderColor)(THIS_ COLORREF *) PURE;
-+};
-+#undef INTERFACE
-+#define INTERFACE IVMRMixerControl9
-+DECLARE_INTERFACE_(IVMRMixerControl9, IUnknown)
-+{
-+ STDMETHOD(SetAlpha)(THIS_ DWORD, float) PURE;
-+ STDMETHOD(GetAlpha)(THIS_ DWORD, float *) PURE;
-+ STDMETHOD(SetZOrder)(THIS_ DWORD, DWORD) PURE;
-+ STDMETHOD(GetZOrder)(THIS_ DWORD, DWORD *) PURE;
-+ STDMETHOD(SetOutputRect)(THIS_ DWORD, const VMR9NormalizedRect *) PURE;
-+ STDMETHOD(GetOutputRect)(THIS_ DWORD, VMR9NormalizedRect *) PURE;
-+ STDMETHOD(SetBackgroundClr)(THIS_ COLORREF) PURE;
-+ STDMETHOD(GetBackgroundClr)(THIS_ COLORREF *) PURE;
-+ STDMETHOD(SetMixingPrefs)(THIS_ DWORD) PURE;
-+ STDMETHOD(GetMixingPrefs)(THIS_ DWORD *) PURE;
-+ STDMETHOD(SetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE;
-+ STDMETHOD(GetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE;
-+ STDMETHOD(GetProcAmpControlRange)(THIS_ DWORD, VMR9ProcAmpControlRange *) PURE;
-+};
-+#undef INTERFACE
- #ifdef __cplusplus
- }
- #endif
diff --git a/src/w32api.mk b/src/w32api.mk
deleted file mode 100644
index 64e9dfd1..00000000
--- a/src/w32api.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG := w32api
-$(PKG)_IGNORE := 4%
-$(PKG)_VERSION := 3.17
-$(PKG)_CHECKSUM := 1eb60b0cd546bf3efdc3fb89a4118df11da2314a
-$(PKG)_SUBDIR := .
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-2-mingw32-dev.tar.lzma
-$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS :=
-
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/' | \
- $(SED) -n 's,.*w32api-\([0-9][^"]*\)/".*,\1,p' | \
- head -1
-endef
-
-define $(PKG)_BUILD_i686-pc-mingw32
- $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
- cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)'
-endef
diff --git a/src/winpthreads.mk b/src/winpthreads.mk
index 342482ab..69d30613 100644
--- a/src/winpthreads.mk
+++ b/src/winpthreads.mk
@@ -8,10 +8,7 @@ $(PKG)_CHECKSUM = $(mingw-w64_CHECKSUM)
$(PKG)_SUBDIR = $(mingw-w64_SUBDIR)
$(PKG)_FILE = $(mingw-w64_FILE)
$(PKG)_URL = $(mingw-w64_URL)
-$(PKG)_DEPS :=
-
-$(PKG)_DEPS_i686-w64-mingw32 := gcc
-$(PKG)_DEPS_x86_64-w64-mingw32 := gcc
+$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
echo $(mingw-w64_VERSION)