Merge svn changes up to r30216

28 files changed, 63 insertions, 42 deletions

diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c
index 1b08757349..55a597b2d7 100644
--- a/loader/dmo/DMO_AudioDecoder.c
+++ b/loader/dmo/DMO_AudioDecoder.c
@@ -5,9 +5,9 @@
 
 *********************************************************/
 #include "config.h"
-#include "dshow/libwin32.h"
+#include "loader/dshow/libwin32.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include "DMO_Filter.h"
diff --git a/loader/dmo/DMO_AudioDecoder.h b/loader/dmo/DMO_AudioDecoder.h
index b4b3dc66e9..d7d0035c84 100644
--- a/loader/dmo/DMO_AudioDecoder.h
+++ b/loader/dmo/DMO_AudioDecoder.h
@@ -1,6 +1,9 @@
 #ifndef MPLAYER_DMO_AUDIODECODER_H
 #define MPLAYER_DMO_AUDIODECODER_H
 
+#include "loader/com.h"
+#include "loader/wine/mmreg.h"
+
 typedef struct DMO_AudioDecoder DMO_AudioDecoder;
 
 //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c
index d5a56ebefd..db0cd4c995 100644
--- a/loader/dmo/DMO_VideoDecoder.c
+++ b/loader/dmo/DMO_VideoDecoder.c
@@ -5,14 +5,14 @@
 
 *********************************************************/
 #include "config.h"
-#include "dshow/guids.h"
-#include "dshow/interfaces.h"
-#include "registry.h"
+#include "loader/dshow/guids.h"
+#include "loader/dshow/interfaces.h"
+#include "loader/registry.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
-#include "dshow/libwin32.h"
+#include "loader/dshow/libwin32.h"
 #include "DMO_Filter.h"
 
 #include "DMO_VideoDecoder.h"
@@ -33,7 +33,7 @@ struct DMO_VideoDecoder
 
 //#include "DMO_VideoDecoder.h"
 
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/loader/dmo/DMO_VideoDecoder.h b/loader/dmo/DMO_VideoDecoder.h
index 9e6269be22..77af6ded09 100644
--- a/loader/dmo/DMO_VideoDecoder.h
+++ b/loader/dmo/DMO_VideoDecoder.h
@@ -1,6 +1,9 @@
 #ifndef MPLAYER_DMO_VIDEODECODER_H
 #define MPLAYER_DMO_VIDEODECODER_H
 
+#include "loader/com.h"
+#include "loader/wine/vfw.h"
+
 typedef struct DMO_VideoDecoder DMO_VideoDecoder;
 
 int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this);
diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c
index 0a74fe6c8a..70883b9abe 100644
--- a/loader/dmo/buffer.c
+++ b/loader/dmo/buffer.c
@@ -1,7 +1,7 @@
 #include "DMO_Filter.h"
 
-#include "wine/winerror.h"
-#include "wine/windef.h"
+#include "loader/wine/winerror.h"
+#include "loader/wine/windef.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c
index 0e4d2a45e4..f8898efcb5 100644
--- a/loader/dmo/dmo.c
+++ b/loader/dmo/dmo.c
@@ -5,12 +5,12 @@
 
 #include "config.h"
 #include "DMO_Filter.h"
-#include "drv.h"
-#include "com.h"
+#include "loader/drv.h"
+#include "loader/com.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "win32.h" // printf macro
+#include "loader/win32.h" // printf macro
 
 void trapbug(void);
 typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h
index b6eeb7410e..dc96bb3326 100644
--- a/loader/dmo/dmo.h
+++ b/loader/dmo/dmo.h
@@ -9,8 +9,8 @@
  *
  */
 
-#include "dshow/iunk.h"
-#include "dshow/guids.h"
+#include "loader/dshow/iunk.h"
+#include "loader/dshow/guids.h"
 
 typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;
 
diff --git a/loader/dmo/dmo_guids.h b/loader/dmo/dmo_guids.h
index 51e93c9a2c..084c501c5a 100644
--- a/loader/dmo/dmo_guids.h
+++ b/loader/dmo/dmo_guids.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_DMO_GUIDS_H
 #define MPLAYER_DMO_GUIDS_H
 
-#include "dshow/guids.h"
+#include "loader/dshow/guids.h"
 
 extern const GUID IID_IMediaBuffer;
 extern const GUID IID_IMediaObject;
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c
index b18b646160..cfa2fcb5a2 100644
--- a/loader/dshow/DS_AudioDecoder.c
+++ b/loader/dshow/DS_AudioDecoder.c
@@ -21,7 +21,7 @@ struct DS_AudioDecoder
 
 #include "DS_AudioDecoder.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include <string.h>
diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index 0b09d3b19c..157993cda3 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.h
@@ -1,6 +1,9 @@
 #ifndef MPLAYER_DS_AUDIODECODER_H
 #define MPLAYER_DS_AUDIODECODER_H
 
+#include "loader/com.h"
+#include "loader/wine/mmreg.h"
+
 typedef struct DS_AudioDecoder DS_AudioDecoder;
 
 //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c
index 5fb1ec73dc..42b47b8626 100644
--- a/loader/dshow/DS_Filter.c
+++ b/loader/dshow/DS_Filter.c
@@ -5,12 +5,12 @@
 
 #include "config.h"
 #include "DS_Filter.h"
-#include "drv.h"
-#include "com.h"
+#include "loader/drv.h"
+#include "loader/com.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "win32.h" // printf macro
+#include "loader/win32.h" // printf macro
 
 typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
 
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index e691bb5dc5..c0441ceacb 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -7,7 +7,7 @@
 #include "config.h"
 #include "guids.h"
 #include "interfaces.h"
-#include "registry.h"
+#include "loader/registry.h"
 #include "libwin32.h"
 #include "DS_Filter.h"
 
@@ -30,9 +30,9 @@ static SampleProcUserData sampleProcData;
 
 #include "DS_VideoDecoder.h"
 
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include <unistd.h>
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index b686554b89..f1a0898868 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -1,6 +1,9 @@
 #ifndef MPLAYER_DS_VIDEODECODER_H
 #define MPLAYER_DS_VIDEODECODER_H
 
+#include "loader/com.h"
+#include "loader/wine/vfw.h"
+
 typedef struct DS_VideoDecoder DS_VideoDecoder;
 
 int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c
index 3e0deabceb..8ead279a37 100644
--- a/loader/dshow/allocator.c
+++ b/loader/dshow/allocator.c
@@ -5,8 +5,8 @@
 
 #include "config.h"
 #include "allocator.h"
-#include "com.h"
-#include "wine/winerror.h"
+#include "loader/com.h"
+#include "loader/wine/winerror.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c
index 98a864b3be..c594bae787 100644
--- a/loader/dshow/cmediasample.c
+++ b/loader/dshow/cmediasample.c
@@ -5,7 +5,7 @@
 
 #include "cmediasample.h"
 #include "mediatype.h"
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h
index 5666ec3041..5bf335f907 100644
--- a/loader/dshow/guids.h
+++ b/loader/dshow/guids.h
@@ -7,13 +7,13 @@ under MinGW
 */
 
 #ifndef GUID_DEFINED
-#include "com.h"
+#include "loader/com.h"
 #endif
 
 #ifndef VFWAPI
-#include "wine/module.h"
-#include "wine/windef.h"
-#include "wine/vfw.h"
+#include "loader/wine/module.h"
+#include "loader/wine/windef.h"
+#include "loader/wine/vfw.h"
 #endif
 
 #include "mediatype.h"
diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c
index 37d9f758fa..5c9b832f7a 100644
--- a/loader/dshow/inputpin.c
+++ b/loader/dshow/inputpin.c
@@ -5,7 +5,7 @@
 
 #include "inputpin.h"
 #include "mediatype.h"
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h
index 8cac9712b8..5c927a55be 100644
--- a/loader/dshow/interfaces.h
+++ b/loader/dshow/interfaces.h
@@ -8,7 +8,7 @@
  */
 
 #include "iunk.h"
-#include "com.h"
+#include "loader/com.h"
 
 /*    Sh*t. MSVC++ and g++ use different methods of storing vtables.    */
 
diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h
index 70d5e0f006..dd25c31941 100644
--- a/loader/dshow/libwin32.h
+++ b/loader/dshow/libwin32.h
@@ -6,10 +6,10 @@
 #include <inttypes.h>
 
 //#define FATAL(a)  // you don't need exception - if you want - just fill more code
-#include "wine/mmreg.h"
-#include "wine/winreg.h"
-#include "wine/vfw.h"
-#include "com.h"
+#include "loader/wine/mmreg.h"
+#include "loader/wine/winreg.h"
+#include "loader/wine/vfw.h"
+#include "loader/com.h"
 
 typedef uint32_t fourcc_t;
 
diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c
index d6597fa767..873c303477 100644
--- a/loader/dshow/mediatype.c
+++ b/loader/dshow/mediatype.c
@@ -22,8 +22,8 @@
  */
 #include "mp_msg.h"
 #include "libmpcodecs/img_format.h"
-#include "wine/winerror.h"
-#include "com.h"
+#include "loader/wine/winerror.h"
+#include "loader/com.h"
 #include "mediatype.h"
 #include "libwin32.h"
 
diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c
index d876f4401f..c24c29efb3 100644
--- a/loader/dshow/outputpin.c
+++ b/loader/dshow/outputpin.c
@@ -3,8 +3,8 @@
  * http://svn.mplayerhq.hu/mplayer/trunk/
  */
 
-#include "wine/winerror.h"
-#include "wine/windef.h"
+#include "loader/wine/winerror.h"
+#include "loader/wine/windef.h"
 #include "outputpin.h"
 #include "mediatype.h"
 #include <stdio.h>
diff --git a/loader/qt_fv.h b/loader/qt_fv.h
index 94ae02c867..f5dbd1d589 100644
--- a/loader/qt_fv.h
+++ b/loader/qt_fv.h
@@ -1,6 +1,8 @@
 #ifndef MPLAYER_QT_FV_H
 #define MPLAYER_QT_FV_H
 
+#include <stddef.h>
+
 typedef struct qt_fv_s {
     unsigned int id;
     char* name;
diff --git a/loader/qtx/list.c b/loader/qtx/list.c
index 0140f9b954..8c1ea6abe2 100644
--- a/loader/qtx/list.c
+++ b/loader/qtx/list.c
@@ -8,7 +8,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 
 char* get_path(const char* x){  return strdup(x);}
 void* LoadLibraryA(char* name);
diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c
index fe95ac87a5..029fad2881 100644
--- a/loader/qtx/qtxload.c
+++ b/loader/qtx/qtxload.c
@@ -4,7 +4,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #include "mp_msg.h"
 
 /* this is what a plain component looks like */
diff --git a/loader/registry.h b/loader/registry.h
index 4e5e708f30..4f0d09f53d 100644
--- a/loader/registry.h
+++ b/loader/registry.h
@@ -17,6 +17,8 @@
 extern "C" {
 #endif
 
+#include "wine/winbase.h"
+
 void free_registry(void);
 
 long __stdcall RegOpenKeyExA(long key, const char* subkey, long reserved,
diff --git a/loader/wine/objbase.h b/loader/wine/objbase.h
index 26d72d76c7..902bbaa32e 100644
--- a/loader/wine/objbase.h
+++ b/loader/wine/objbase.h
@@ -1,6 +1,8 @@
 #ifndef MPLAYER_OBJBASE_H
 #define MPLAYER_OBJBASE_H
 
+#include "windef.h"
+
 #ifndef STDCALL
 #define STDCALL __attribute__((__stdcall__))
 #endif
diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h
index a3b05daff3..1cf94b5ac7 100644
--- a/loader/wine/vfw.h
+++ b/loader/wine/vfw.h
@@ -10,6 +10,8 @@
 extern "C" {
 #endif
 
+#include "windef.h"
+
 typedef struct __attribute__((__packed__))
 {
     short    bfType;
diff --git a/loader/wine/winuser.h b/loader/wine/winuser.h
index bf60f873f0..cda96c4f23 100644
--- a/loader/wine/winuser.h
+++ b/loader/wine/winuser.h
@@ -9,6 +9,7 @@
 extern "C" {
 #endif
 
+#include "windef.h"
 #include "pshpack1.h"
 
 /* flags for HIGHCONTRAST dwFlags field */