Francois Gouget : include/dshow.h: Add missing include directives.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Nov 9 13:57:15 CST 2006


Module: wine
Branch: master
Commit: 8a2b4026b9cde30722d7a9d63a689cff49e005d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a2b4026b9cde30722d7a9d63a689cff49e005d2

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Nov  9 11:36:08 2006 +0100

include/dshow.h: Add missing include directives.

---

 include/dshow.h |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/include/dshow.h b/include/dshow.h
index 94dc7db..6513140 100644
--- a/include/dshow.h
+++ b/include/dshow.h
@@ -21,24 +21,35 @@ #define __DSHOW_INCLUDED__
 
 #define AM_NOVTABLE
 
-#include <windef.h>
-#include <wingdi.h>
-#include <objbase.h>
+#ifndef __WINESRC__
+# include <windows.h>
+# include <windowsx.h>
+#else
+# include <windef.h>
+# include <wingdi.h>
+# include <objbase.h>
+#endif
+#include <olectl.h>
 #include <ddraw.h>
 #include <mmsystem.h>
+/* FIXME: #include <strsafe.h>*/
 
 #ifndef NUMELMS
 #define NUMELMS(array) (sizeof(array)/sizeof((array)[0]))
 #endif
 
 #include <strmif.h>
-/*#include <amvideo.h>*/
-/*#include <amaudio.h>*/
+#include <amvideo.h>
+#ifdef DSHOW_USE_AMAUDIO
+/* FIXME: #include <amaudio.h>*/
+#endif
 #include <control.h>
-/*#include <evcode.h>*/
+#include <evcode.h>
 #include <uuids.h>
 #include <errors.h>
+/* FIXME: #include <edevdefs.h> */
 #include <audevcod.h>
+/* FIXME: #include <dvdevcod.h> */
 
 #ifndef OATRUE
 #define OATRUE (-1)




More information about the wine-cvs mailing list