Fix compilation of msacm conformance tests

[Francois Gouget]

On Windows mmreg.h had extra definitions that required either including
wingdi.h first, or defining NOBITMAP. This adds some of these
definitions to our mmreg.h header and adds the NOBITMAP define where
needed.


Changelog:

 * dlls/msacm/filter.c
   dlls/msacm/msacm32_main.c
   dlls/msacm/msacm_main.c
   dlls/msacm/pcmconverter.c
   dlls/msacm/stream.c
   dlls/msacm/tests/msacm.c
   include/mmreg.h

   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.


Index: dlls/msacm/filter.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/filter.c,v
retrieving revision 1.16
diff -u -r1.16 filter.c
--- dlls/msacm/filter.c	5 Sep 2003 23:08:36 -0000	1.16
+++ dlls/msacm/filter.c	10 Aug 2004 23:13:31 -0000
@@ -27,6 +27,7 @@
 #include "winnls.h"
 #include "winerror.h"
 #include "mmsystem.h"
+#define NOBITMAP
 #include "mmreg.h"
 #include "msacm.h"
 #include "msacmdrv.h"
Index: dlls/msacm/msacm32_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/msacm32_main.c,v
retrieving revision 1.18
diff -u -r1.18 msacm32_main.c
--- dlls/msacm/msacm32_main.c	3 May 2004 20:09:42 -0000	1.18
+++ dlls/msacm/msacm32_main.c	10 Aug 2004 14:32:44 -0000
@@ -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"
Index: dlls/msacm/msacm_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/msacm_main.c,v
retrieving revision 1.16
diff -u -r1.16 msacm_main.c
--- dlls/msacm/msacm_main.c	5 Sep 2003 23:08:36 -0000	1.16
+++ dlls/msacm/msacm_main.c	10 Aug 2004 14:31:54 -0000
@@ -24,6 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "mmsystem.h"
+#define NOBITMAP
 #include "mmreg.h"
 #include "msacm.h"
 #include "msacmdrv.h"
Index: dlls/msacm/pcmconverter.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/pcmconverter.c,v
retrieving revision 1.19
diff -u -r1.19 pcmconverter.c
--- dlls/msacm/pcmconverter.c	10 May 2004 19:56:53 -0000	1.19
+++ dlls/msacm/pcmconverter.c	10 Aug 2004 14:32:55 -0000
@@ -38,6 +38,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "mmsystem.h"
+#define NOBITMAP
 #include "mmreg.h"
 #include "msacm.h"
 #include "wingdi.h"
Index: dlls/msacm/stream.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/stream.c,v
retrieving revision 1.16
diff -u -r1.16 stream.c
--- dlls/msacm/stream.c	12 Mar 2004 20:24:50 -0000	1.16
+++ dlls/msacm/stream.c	10 Aug 2004 14:33:07 -0000
@@ -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"
Index: dlls/msacm/tests/msacm.c
===================================================================
RCS file: /var/cvs/wine/dlls/msacm/tests/msacm.c,v
retrieving revision 1.2
diff -u -r1.2 msacm.c
--- dlls/msacm/tests/msacm.c	10 May 2004 19:56:53 -0000	1.2
+++ dlls/msacm/tests/msacm.c	10 Aug 2004 14:16:34 -0000
@@ -28,6 +28,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "mmsystem.h"
+#define NOBITMAP
 #include "mmreg.h"
 #include "msacm.h"

Index: include/mmreg.h
===================================================================
RCS file: /var/cvs/wine/include/mmreg.h,v
retrieving revision 1.13
diff -u -r1.13 mmreg.h
--- include/mmreg.h	12 Mar 2004 19:43:19 -0000	1.13
+++ include/mmreg.h	10 Aug 2004 14:21:09 -0000
@@ -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 */



-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
In theory, theory and practice are the same, but in practice they're different.