Add some missing definitions to mmreg.h.
Add #define NOBITMAP where needed in the Wine sources.
Fixes the compilation of msacm/tests/msacm.c with the Windows
headers.
diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c
index 3bce5c2..84ded51 100644
--- a/dlls/msacm/filter.c
+++ b/dlls/msacm/filter.c
@@ -27,6 +27,7 @@
#include "winnls.h"
#include "winerror.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c
index dde962a..643d94b 100644
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -28,6 +28,7 @@
#include "winerror.h"
#include "wine/debug.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index 01bfa75..53b17e1 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -24,6 +24,7 @@
#include "winbase.h"
#include "winerror.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
@@ -459,5 +460,3 @@
* FIXME
* No documentation found.
*/
-
-
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index 3f335d0..5a4f311 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -38,6 +38,7 @@
#include "windef.h"
#include "winbase.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
#include "wingdi.h"
diff --git a/dlls/msacm/stream.c b/dlls/msacm/stream.c
index 5c427ec..44c62c3 100644
--- a/dlls/msacm/stream.c
+++ b/dlls/msacm/stream.c
@@ -35,6 +35,7 @@
#include "winerror.h"
#include "wine/debug.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
diff --git a/dlls/msacm/tests/msacm.c b/dlls/msacm/tests/msacm.c
index 247c911..112a3d2 100644
--- a/dlls/msacm/tests/msacm.c
+++ b/dlls/msacm/tests/msacm.c
@@ -28,6 +28,7 @@
#include "winbase.h"
#include "winnls.h"
#include "mmsystem.h"
+#define NOBITMAP
#include "mmreg.h"
#include "msacm.h"
diff --git a/include/mmreg.h b/include/mmreg.h
index dc911b3..91b535a 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -457,4 +457,38 @@
#endif /* _SPEAKER_POSITIONS_ */
+
+/* DIB stuff */
+
+#ifndef BI_BITFIELDS
+#define BI_BITFIELDS 3
+#endif
+
+#ifndef QUERYDIBSUPPORT
+#define QUERYDIBSUPPORT 3073
+#define QDI_SETDIBITS 1
+#define QDI_GETDIBITS 2
+#define QDI_DIBTOSCREEN 4
+#define QDI_STRETCHDIB 8
+#endif
+
+#ifndef NOBITMAP
+typedef struct tagEXBMINFOHEADER {
+ BITMAPINFOHEADER bmi;
+ DWORD biExtDataOffset;
+} EXBMINFOHEADER;
+#endif
+
+
+/* Video stuff */
+
+#ifndef NONEWIC
+
+#ifndef ICTYPE_VIDEO
+#define ICTYPE_VIDEO mmioFOURCC('v', 'i', 'd', 'c')
+#define ICTYPE_AUDIO mmioFOURCC('a', 'u', 'd', 'c')
+#endif
+
+#endif
+
#endif /* __WINE_MMREG_H */
