vfw.h cleanup (take 2)
Dimitrie O. Paun
dpaun at rogers.com
Thu Sep 4 00:05:59 CDT 2003
Oops, I've left out one file...
ChangeLog
Remove non-standard header includes from vfw.h
Index: include/vfw.h
===================================================================
RCS file: /var/cvs/wine/include/vfw.h,v
retrieving revision 1.38
diff -u -r1.38 vfw.h
--- include/vfw.h 2 Sep 2003 00:54:30 -0000 1.38
+++ include/vfw.h 4 Sep 2003 04:46:02 -0000
@@ -19,9 +19,9 @@
#ifndef __WINE_VFW_H
#define __WINE_VFW_H
-#include <windef.h>
+#include <mmreg.h>
+#include <msacm.h>
#include <mmsystem.h>
-#include <wingdi.h>
#define VFWAPI WINAPI
#define VFWAPIV WINAPIV
Index: dlls/avicap32/avicap32_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/avicap32/avicap32_main.c,v
retrieving revision 1.8
diff -u -r1.8 avicap32_main.c
--- dlls/avicap32/avicap32_main.c 3 Jan 2003 19:12:57 -0000 1.8
+++ dlls/avicap32/avicap32_main.c 4 Sep 2003 04:51:00 -0000
@@ -17,8 +17,11 @@
*/
#define COM_NO_WINDOWS_H
+#include "windef.h"
+#include "wingdi.h"
#include "vfw.h"
#include "winternl.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(avicap);
Index: dlls/avifil32/acmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/acmstream.c,v
retrieving revision 1.6
diff -u -r1.6 acmstream.c
--- dlls/avifil32/acmstream.c 23 Jun 2003 18:10:06 -0000 1.6
+++ dlls/avifil32/acmstream.c 4 Sep 2003 04:55:24 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
Index: dlls/avifil32/api.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/api.c,v
retrieving revision 1.22
diff -u -r1.22 api.c
--- dlls/avifil32/api.c 2 Sep 2003 00:54:30 -0000 1.22
+++ dlls/avifil32/api.c 4 Sep 2003 04:53:21 -0000
@@ -20,8 +20,10 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
Index: dlls/avifil32/avifile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/avifile.c,v
retrieving revision 1.37
diff -u -r1.37 avifile.c
--- dlls/avifil32/avifile.c 2 Sep 2003 00:54:30 -0000 1.37
+++ dlls/avifil32/avifile.c 4 Sep 2003 04:57:22 -0000
@@ -33,9 +33,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
+#include "wingdi.h"
#include "winerror.h"
#include "windowsx.h"
#include "mmsystem.h"
Index: dlls/avifil32/extrachunk.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/extrachunk.c,v
retrieving revision 1.6
diff -u -r1.6 extrachunk.c
--- dlls/avifil32/extrachunk.c 30 Jul 2003 03:42:26 -0000 1.6
+++ dlls/avifil32/extrachunk.c 4 Sep 2003 04:54:01 -0000
@@ -19,8 +19,10 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
-#include "extrachunk.h"
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "extrachunk.h"
#include "windowsx.h"
#include "vfw.h"
Index: dlls/avifil32/factory.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/factory.c,v
retrieving revision 1.9
diff -u -r1.9 factory.c
--- dlls/avifil32/factory.c 30 Jun 2003 20:53:50 -0000 1.9
+++ dlls/avifil32/factory.c 4 Sep 2003 04:53:41 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winnls.h"
#include "winerror.h"
Index: dlls/avifil32/getframe.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/getframe.c,v
retrieving revision 1.7
diff -u -r1.7 getframe.c
--- dlls/avifil32/getframe.c 2 Sep 2003 00:54:30 -0000 1.7
+++ dlls/avifil32/getframe.c 4 Sep 2003 04:54:21 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winnls.h"
#include "windowsx.h"
#include "vfw.h"
Index: dlls/avifil32/icmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/icmstream.c,v
retrieving revision 1.5
diff -u -r1.5 icmstream.c
--- dlls/avifil32/icmstream.c 23 Jun 2003 18:10:06 -0000 1.5
+++ dlls/avifil32/icmstream.c 4 Sep 2003 04:55:44 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
Index: dlls/avifil32/regsvr.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/regsvr.c,v
retrieving revision 1.1
diff -u -r1.1 regsvr.c
--- dlls/avifil32/regsvr.c 23 Aug 2003 22:54:53 -0000 1.1
+++ dlls/avifil32/regsvr.c 4 Sep 2003 04:56:32 -0000
@@ -23,6 +23,7 @@
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
Index: dlls/avifil32/tmpfile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/tmpfile.c,v
retrieving revision 1.1
diff -u -r1.1 tmpfile.c
--- dlls/avifil32/tmpfile.c 23 Jun 2003 18:10:06 -0000 1.1
+++ dlls/avifil32/tmpfile.c 4 Sep 2003 04:56:04 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
Index: dlls/avifil32/wavfile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/wavfile.c,v
retrieving revision 1.7
diff -u -r1.7 wavfile.c
--- dlls/avifil32/wavfile.c 21 Jul 2003 20:00:36 -0000 1.7
+++ dlls/avifil32/wavfile.c 4 Sep 2003 04:54:44 -0000
@@ -19,7 +19,9 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
Index: dlls/msvideo/msrle32/msrle32.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/msrle32/msrle32.c,v
retrieving revision 1.8
diff -u -r1.8 msrle32.c
--- dlls/msvideo/msrle32/msrle32.c 9 Jul 2003 02:52:58 -0000 1.8
+++ dlls/msvideo/msrle32/msrle32.c 4 Sep 2003 05:04:09 -0000
@@ -23,11 +23,14 @@
#include <assert.h>
-#include "msrle_private.h"
-
-#include "winnls.h"
+#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
+#include "wingdi.h"
+#include "winnls.h"
#include "windowsx.h"
+
+#include "msrle_private.h"
#include "wine/debug.h"
--
Dimi.
More information about the wine-patches
mailing list