this patches removes some Wine only definitions from the standard headers.
A+
--
Eric Pouech
Name: mm_inc
ChangeLog:
Moved some MM internal definition to internal include files
License: X11
GenDate: 2003/09/01 19:54:20 UTC
ModifiedFiles: include/mmsystem.h dlls/msvideo/msvideo_main.c dlls/winmm/winemm.h
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/include/mmsystem.h,v
retrieving revision 1.66
diff -u -u -r1.66 mmsystem.h
--- include/mmsystem.h 28 Aug 2003 21:43:35 -0000 1.66
+++ include/mmsystem.h 30 Aug 2003 11:51:35 -0000
@@ -231,13 +231,6 @@
HMODULE WINAPI GetDriverModuleHandle(HDRVR hDriver);
DWORD WINAPI GetDriverFlags(HDRVR hDriver);
-#ifdef __WINESRC__
-/* this call (GetDriverFlags) is not documented, nor the flags returned.
- * here are Wine only definitions
- */
-#define WINE_GDF_EXIST 0x80000000
-#define WINE_GDF_16BIT 0x10000000
-#endif
typedef void (CALLBACK *LPDRVCALLBACK) (HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
@@ -306,9 +299,6 @@
#define WAVE_MAPPED 0x0004
#define WAVE_FORMAT_DIRECT 0x0008
#define WAVE_FORMAT_DIRECT_QUERY (WAVE_FORMAT_QUERY | WAVE_FORMAT_DIRECT)
-#ifdef __WINESRC__
-#define WAVE_DIRECTSOUND 0x0080
-#endif
typedef struct wavehdr_tag {
LPSTR lpData; /* pointer to locked data buffer */
Index: dlls/msvideo/msvideo_main.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/dlls/msvideo/msvideo_main.c,v
retrieving revision 1.51
diff -u -u -r1.51 msvideo_main.c
--- dlls/msvideo/msvideo_main.c 2 Jul 2003 00:40:14 -0000 1.51
+++ dlls/msvideo/msvideo_main.c 30 Aug 2003 11:42:08 -0000
@@ -319,7 +319,7 @@
if (!hdrv)
return 0;
}
- bIs16 = GetDriverFlags(hdrv) & WINE_GDF_16BIT;
+ bIs16 = GetDriverFlags(hdrv) & 0x10000000; /* undocumented flag: WINE_GDF_16BIT */
if (bIs16 && !pFnCallTo16)
{
Index: dlls/winmm/winemm.h
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/dlls/winmm/winemm.h,v
retrieving revision 1.44
diff -u -u -r1.44 winemm.h
--- dlls/winmm/winemm.h 30 Apr 2003 17:28:45 -0000 1.44
+++ dlls/winmm/winemm.h 30 Aug 2003 11:41:45 -0000
@@ -336,3 +336,10 @@
#define HWAVE_16(h32) (LOWORD(h32))
#define HWAVEIN_16(h32) (LOWORD(h32))
#define HWAVEOUT_16(h32) (LOWORD(h32))
+
+/* GetDriverFlags() returned bits is not documented (nor the call itself)
+ * Here are Wine only definitions of the bits
+ */
+#define WINE_GDF_EXIST 0x80000000
+#define WINE_GDF_16BIT 0x10000000
+
