Merge svn changes up to r26587

Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c

9 files changed, 14 insertions, 139 deletions

diff --git a/loader/Makefile b/loader/Makefile
deleted file mode 100644
index 3765c8c6ad..0000000000
--- a/loader/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = loader.a
-
-#CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
-
-SRCS_COMMON  = driver.c afl.c vfl.c
-SRCS_COMMON-$(QTX_EMULATION)   += wrapper.S
-SRCS_COMMON-$(WIN32_EMULATION) += elfdll.c \
-                                  ext.c \
-                                  ldt_keeper.c \
-                                  module.c \
-                                  pe_image.c \
-                                  pe_resource.c \
-                                  registry.c \
-                                  resource.c \
-                                  win32.c \
-
-SRCS_COMMON += dshow/DS_AudioDecoder.c \
-               dshow/DS_Filter.c \
-               dshow/DS_VideoDecoder.c \
-               dshow/allocator.c \
-               dshow/mediatype.c \
-               dshow/cmediasample.c \
-               dshow/guids.c \
-               dshow/inputpin.c \
-               dshow/outputpin.c \
-               dmo/DMO_AudioDecoder.c \
-               dmo/DMO_VideoDecoder.c   \
-               dmo/buffer.c   \
-               dmo/dmo.c  \
-               dmo/dmo_guids.c \
-
-include ../mpcommon.mak
-
-CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER)
-win32.o: CFLAGS += $(CFLAG_STACKREALIGN)
-
-TEST_OBJS    = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a
-TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g
-
-dshow/test: dshow/test.c ../get_path.o $(TEST_OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) -lstdc++
-
-qtx/qtxload: qtx/qtxload.c $(TEST_OBJS)
-	$(CC) -o $@ $^ $(TEST_LDFLAGS)
-
-qtx/list: qtx/list.c  $(TEST_OBJS)
-	$(CC) -o $@ $^ $(TEST_LDFLAGS)
-
-clean::
-	rm -f dshow/*.o dshow/*.a dshow/*~
-	rm -f dmo/*.o dmo/*.a dmo/*~
-	rm -f dshow/test dshow/test.raw
-	rm -f qtx/list qtx/qtxload
diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c
index 398cd86f51..0b83d48f4c 100644
--- a/loader/dmo/DMO_AudioDecoder.c
+++ b/loader/dmo/DMO_AudioDecoder.c
@@ -28,7 +28,7 @@ struct DMO_AudioDecoder
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../../mp_msg.h"
+#include "mp_msg.h"
 
 typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**);
 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c
index c018506d75..9f3e9d7eb8 100644
--- a/loader/dmo/DMO_VideoDecoder.c
+++ b/loader/dmo/DMO_VideoDecoder.c
@@ -9,7 +9,7 @@
 #include "dshow/interfaces.h"
 #include "registry.h"
 #ifdef WIN32_LOADER
-#include "../ldt_keeper.h"
+#include "ldt_keeper.h"
 #endif
 
 #include "dshow/libwin32.h"
@@ -33,7 +33,7 @@ struct DMO_VideoDecoder
 
 //#include "DMO_VideoDecoder.h"
 
-#include "../wine/winerror.h"
+#include "wine/winerror.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c
index 73e7abcecb..2ac48cd25e 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 "ldt_keeper.h"
 #endif
 
 #include <string.h>
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index 415e7a3fb5..a10436e325 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -30,9 +30,9 @@ static SampleProcUserData sampleProcData;
 
 #include "DS_VideoDecoder.h"
 
-#include "../wine/winerror.h"
+#include "wine/winerror.h"
 #ifdef WIN32_LOADER
-#include "../ldt_keeper.h"
+#include "ldt_keeper.h"
 #endif
 
 #include <unistd.h>
diff --git a/loader/dshow/test.c b/loader/dshow/test.c
deleted file mode 100644
index 1b9818886e..0000000000
--- a/loader/dshow/test.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "wine/mmreg.h"
-#include "wine/vfw.h"
-
-#include "formats.h"
-#include "com.h"
-
-#include "DS_VideoDec.h"
-
-int main(int argc,char* argv[]){
-    FILE *f;
-    BITMAPINFOHEADER bih;
-    int len;
-    char *src;
-    char *dst=0;
-    GUID CLSID_DivxDecompressorCF={0x82CCd3E0, 0xF71A, 0x11D0,
-    { 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}};
-
-    f=fopen("test.divx","rb");
-    
-    fread(&bih,sizeof(BITMAPINFOHEADER),1,f);
-    printf("frame dim: %d x %d \n",(int)bih.biWidth,(int)bih.biHeight);
-
-    src=malloc(512000);
-    len=fread(src,1,512000,f);
-    printf("frame len = %d\n",len);
-
-    DS_VideoDecoder_Open("divx_c32.ax", &CLSID_DivxDecompressorCF, &bih, 0, &dst);
-
-//    DS_VideoDecoder_SetDestFmt(16,fccYUY2);
-    DS_VideoDecoder_SetDestFmt(24,0);
-
-    printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",4) );
-
-    DS_VideoDecoder_Start();
-
-    printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
-
-    DS_VideoDecoder_DecodeFrame(src, len, 1, 1);
-
-#if 0
-    f2=fopen("test.yuy2","wb");
-    fwrite(dst,bih.biWidth*bih.biHeight*2,1,f2);
-    fclose(f2);
-#endif    
-
-      { unsigned char raw_head[32];
-        FILE *f=fopen("test.raw","wb");
-
-        strcpy((char*)raw_head,"mhwanh");
-        raw_head[7]=4;
-        raw_head[8]=bih.biWidth>>8;
-        raw_head[9]=bih.biWidth&0xFF;
-        raw_head[10]=bih.biHeight>>8;
-        raw_head[11]=bih.biHeight&0xFF;
-        raw_head[12]=raw_head[13]=0; // 24bit
-        raw_head[14]=1;raw_head[15]=0x2C;
-        raw_head[16]=1;raw_head[17]=0x2C;
-        memset(raw_head+18,0,32-18);
-        fwrite(raw_head,32,1,f);
-        
-        fwrite(dst,bih.biWidth*bih.biHeight*3,1,f);
-        fclose(f);
-      }
-
-
-return 0;
-}
diff --git a/loader/dshow/test.divx b/loader/dshow/test.divx
deleted file mode 100644
index 397f72989a..0000000000
--- a/loader/dshow/test.divx
+++ /dev/null
diff --git a/loader/qtx/list.c b/loader/qtx/list.c
index 5c782fc05a..34e93dccc5 100644
--- a/loader/qtx/list.c
+++ b/loader/qtx/list.c
@@ -8,6 +8,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
+#include "ldt_keeper.h"
 
 char* get_path(const char* x){  return strdup(x);}
 void* LoadLibraryA(char* name);
@@ -51,8 +52,7 @@ int main(int argc, char *argv[]){
     desc.componentFlags=0;
     desc.componentFlagsMask=0;
     
-    printf("Count = %d\n",CountComponents(&desc));
-    
-    Restore_LDT_Keeper();
+    printf("Count = %ld\n",CountComponents(&desc));
+
     exit(0);
 }
diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c
index d17c3138d9..88dc032d33 100644
--- a/loader/qtx/qtxload.c
+++ b/loader/qtx/qtxload.c
@@ -4,6 +4,8 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
+#include "ldt_keeper.h"
+#include "mp_msg.h"
 
 /* ilyen egy sima komponens */
 ComponentResult ComponentDummy(
@@ -42,8 +44,8 @@ int main(int argc, char *argv[]){
     ComponentParameters *params;
     ComponentDescription desc;
     void *globals=NULL;
-    unsigned int esp=0;
-    int i;
+    //unsigned int esp=0;
+    //int i;
 
     mp_msg_init();
     //mp_msg_set_level(10);
@@ -120,8 +122,7 @@ int main(int argc, char *argv[]){
 
 //    for(i=0;i<0x00001837;i++)
 //	if(x_table[i]) printf("x_table[0x%X] = %p\n",i,x_table[i]);
-    
-    Restore_LDT_Keeper();
+
     exit(0);
     //return 0;
 }