RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 07:12:39 +00:00
Code Issues Releases Wiki Activity

loader gcc warning fixes and avifile sync

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13183 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2004-08-28 20:22:38 +00:00
parent 450854c020
commit 644c09f266
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader/module.c
View File

@ -1002,7 +1002,7 @@ FARPROC MODULE_GetProcAddress(
fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc); fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
report_entry = report_func; report_entry = report_func;
report_ret = report_func_ret; report_ret = report_func_ret;
wrapper_target=retproc; wrapper_target=(void(*)(void))retproc;
retproc=(FARPROC)wrapper; retproc=(FARPROC)wrapper;
} }

6
loader/win32.c
View File

@ -863,7 +863,7 @@ static void* WINAPI expWaitForMultipleObjects(int count, const void** objects,
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
object = objects[i]; object = (void *)objects[i];
ret = expWaitForSingleObject(object, duration); ret = expWaitForSingleObject(object, duration);
if (WaitAll) if (WaitAll)
dbgprintf("WaitAll flag not yet supported...\n"); dbgprintf("WaitAll flag not yet supported...\n");
@ -1943,7 +1943,7 @@ static DWORD WINAPI expRegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_l
LPDWORD values, LPDWORD max_value, LPDWORD max_data, LPDWORD values, LPDWORD max_value, LPDWORD max_data,
LPDWORD security, FILETIME *modif ) LPDWORD security, FILETIME *modif )
{ {
return; return ERROR_SUCCESS;
} }
/* /*
@ -3645,7 +3645,7 @@ static DWORD WINAPI expGetFullPathNameA
if (strrchr(lpFileName, '\\')) if (strrchr(lpFileName, '\\'))
lpFilePart = strrchr(lpFileName, '\\'); lpFilePart = strrchr(lpFileName, '\\');
else else
lpFilePart = lpFileName; lpFilePart = (LPTSTR)lpFileName;
#endif #endif
strcpy(lpBuffer, lpFileName); strcpy(lpBuffer, lpFileName);
// strncpy(lpBuffer, lpFileName, rindex(lpFileName, '\\')-lpFileName); // strncpy(lpBuffer, lpFileName, rindex(lpFileName, '\\')-lpFileName);

18
loader/wine/vfw.h
View File

@ -19,17 +19,17 @@ typedef struct __attribute__((__packed__))
#define _BITMAPINFOHEADER_ #define _BITMAPINFOHEADER_
typedef struct __attribute__((__packed__)) typedef struct __attribute__((__packed__))
{ {
int biSize; long biSize;
int biWidth; long biWidth;
int biHeight; long biHeight;
short biPlanes; short biPlanes;
short biBitCount; short biBitCount;
int biCompression; long biCompression;
int biSizeImage; long biSizeImage;
int biXPelsPerMeter; long biXPelsPerMeter;
int biYPelsPerMeter; long biYPelsPerMeter;
int biClrUsed; long biClrUsed;
int biClrImportant; long biClrImportant;
} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
typedef struct { typedef struct {
BITMAPINFOHEADER bmiHeader; BITMAPINFOHEADER bmiHeader;

4
loader/wine/windef.h
View File

@ -156,8 +156,8 @@ typedef void VOID;
typedef int INT; typedef int INT;
typedef unsigned int UINT; typedef unsigned int UINT;
typedef unsigned short WORD; typedef unsigned short WORD;
typedef unsigned int DWORD; typedef unsigned long DWORD;
typedef unsigned int ULONG; typedef unsigned long ULONG;
typedef unsigned char BYTE; typedef unsigned char BYTE;
typedef long LONG; typedef long LONG;
typedef short SHORT; typedef short SHORT;