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.

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"

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"

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 @@ MMRESULT16 WINAPI acmStreamUnprepareHeader16(
  * FIXME
  *   No documentation found.
  */
-
-

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"

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"

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"
 

include/mmreg.h

@@ -457,4 +457,38 @@ typedef WAVEFORMATIEEEFLOATEX*  LPWAVEFORMATIEEEFLOATEX;
 
 #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 */