Mercurial > mplayer.hg

changeset 13182:25cb0d6432d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loader gcc warning fixes and avifile sync
author rathann
date Sat, 28 Aug 2004 20:22:38 +0000
parents 12176045ccf9
children ca4c07c87e6f
files loader/module.c loader/win32.c loader/wine/vfw.h loader/wine/windef.h
diffstat 4 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/loader/module.c	Sat Aug 28 20:20:40 2004 +0000
+++ b/loader/module.c	Sat Aug 28 20:22:38 2004 +0000
@@ -1002,7 +1002,7 @@
 	fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
       report_entry = report_func;
       report_ret   = report_func_ret;
-      wrapper_target=retproc;
+      wrapper_target=(void(*)(void))retproc;
       retproc=(FARPROC)wrapper;
     }
 
--- a/loader/win32.c	Sat Aug 28 20:20:40 2004 +0000
+++ b/loader/win32.c	Sat Aug 28 20:22:38 2004 +0000
@@ -863,7 +863,7 @@
     
     for (i = 0; i < count; i++)
     {
-	object = objects[i];
+	object = (void *)objects[i];
 	ret = expWaitForSingleObject(object, duration);
 	if (WaitAll)
 	    dbgprintf("WaitAll flag not yet supported...\n");
@@ -1943,7 +1943,7 @@
                                          LPDWORD values, LPDWORD max_value, LPDWORD max_data,
                                          LPDWORD security, FILETIME *modif )
 {
-    return;
+    return ERROR_SUCCESS;
 }
 
 /*
@@ -3645,7 +3645,7 @@
     if (strrchr(lpFileName, '\\'))
 	lpFilePart = strrchr(lpFileName, '\\');
     else
-	lpFilePart = lpFileName;
+	lpFilePart = (LPTSTR)lpFileName;
 #endif
     strcpy(lpBuffer, lpFileName);
 //    strncpy(lpBuffer, lpFileName, rindex(lpFileName, '\\')-lpFileName);
--- a/loader/wine/vfw.h	Sat Aug 28 20:20:40 2004 +0000
+++ b/loader/wine/vfw.h	Sat Aug 28 20:22:38 2004 +0000
@@ -19,17 +19,17 @@
 #define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {
-    int 	biSize;
-    int  	biWidth;
-    int  	biHeight;
+    long 	biSize;
+    long  	biWidth;
+    long  	biHeight;
     short 	biPlanes;
     short 	biBitCount;
-    int 	biCompression;
-    int 	biSizeImage;
-    int  	biXPelsPerMeter;
-    int  	biYPelsPerMeter;
-    int 	biClrUsed;
-    int 	biClrImportant;
+    long 	biCompression;
+    long 	biSizeImage;
+    long  	biXPelsPerMeter;
+    long  	biYPelsPerMeter;
+    long 	biClrUsed;
+    long 	biClrImportant;
 } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
 typedef struct {
 	BITMAPINFOHEADER bmiHeader;
--- a/loader/wine/windef.h	Sat Aug 28 20:20:40 2004 +0000
+++ b/loader/wine/windef.h	Sat Aug 28 20:22:38 2004 +0000
@@ -156,8 +156,8 @@
 typedef int             INT;
 typedef unsigned int    UINT;
 typedef unsigned short  WORD;
-typedef unsigned int    DWORD;
-typedef unsigned int    ULONG;
+typedef unsigned long   DWORD;
+typedef unsigned long   ULONG;
 typedef unsigned char   BYTE;
 typedef long            LONG;
 typedef short           SHORT;