[Mplayer-cvslog] CVS: main/loader vfl.c,1.1.1.1,1.2 win32.c,1.9,1.10
Szabolcs Berecz
szabii at users.sourceforge.net
Mon Apr 23 22:16:39 CEST 2001
- Previous message: [Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.14,1.15
- Next message: [Mplayer-cvslog] CVS: main mplayer.c,1.94,1.95 stream.h,1.2,1.3 stream.c,1.5,1.6 demuxer.c,1.5,1.6 vcd_read.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/loader
In directory usw-pr-cvs1:/tmp/cvs-serv18172
Modified Files:
vfl.c win32.c
Log Message:
no more warnings...
Index: vfl.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/vfl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** vfl.c 2001/02/24 20:30:28 1.1.1.1
--- vfl.c 2001/04/23 20:16:37 1.2
***************
*** 22,26 ****
extern void* my_mreq(int size, int to_zero);
extern void DrvClose(HDRVR hdrvr);
! extern int my_release(char* memory);
long VFWAPIV ICDecompress(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER lpbi,void* lpBits);
--- 22,26 ----
extern void* my_mreq(int size, int to_zero);
extern void DrvClose(HDRVR hdrvr);
! extern int my_release(void* memory);
long VFWAPIV ICDecompress(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER lpbi,void* lpBits);
Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** win32.c 2001/04/17 23:04:37 1.9
--- win32.c 2001/04/23 20:16:37 1.10
***************
*** 18,25 ****
#include <pthread.h>
#include <errno.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
- #else
- #include <stdlib.h>
#endif
#include <time.h>
--- 18,25 ----
#include <pthread.h>
#include <errno.h>
+ #include <ctype.h>
+ #include <stdlib.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#include <time.h>
***************
*** 224,228 ****
return heap+heap_counter-size;
}
! int my_release(char* memory)
{
// test_heap();
--- 224,228 ----
return heap+heap_counter-size;
}
! int my_release(void* memory)
{
// test_heap();
***************
*** 248,257 ****
typedef struct alc_list_t {
int size;
! int addr;
struct alc_list_t *prev;
struct alc_list_t *next;
}alc_list;
static alc_list *alclist=NULL;
! static alccnt=0;
#endif
--- 248,257 ----
typedef struct alc_list_t {
int size;
! void *addr;
struct alc_list_t *prev;
struct alc_list_t *next;
}alc_list;
static alc_list *alclist=NULL;
! static int alccnt=0;
#endif
***************
*** 281,285 ****
return (int*)((int)answer+sizeof(int));
}
! int my_release(char* memory)
{
#ifdef GARBAGE
--- 281,285 ----
return (int*)((int)answer+sizeof(int));
}
! int my_release(void* memory)
{
#ifdef GARBAGE
***************
*** 308,312 ****
}
if (pp == NULL) {
! printf("Not Found %x %d\n",memory-4,alccnt);
return 0;
}
--- 308,312 ----
}
if (pp == NULL) {
! printf("Not Found %p %d\n",memory-4,alccnt);
return 0;
}
***************
*** 436,440 ****
{
if(strcasecmp(name, "kernel32")==0)
! result=0x120;
}
dbgprintf("GetModuleHandleA('%s') => 0x%x\n", name, result);
--- 436,440 ----
{
if(strcasecmp(name, "kernel32")==0)
! result=(void *) 0x120;
}
dbgprintf("GetModuleHandleA('%s') => 0x%x\n", name, result);
***************
*** 516,520 ****
return pp->pm;
}
! }while(pp=pp->prev);
}
pm=my_mreq(sizeof(pthread_mutex_t), 0);
--- 516,520 ----
return pp->pm;
}
! }while((pp=pp->prev));
}
pm=my_mreq(sizeof(pthread_mutex_t), 0);
***************
*** 592,596 ****
if((pp->pm, mlist->pm)==0)
break;;
! }while(pp=pp->prev);
--- 592,596 ----
if((pp->pm, mlist->pm)==0)
break;;
! }while((pp=pp->prev));
***************
*** 1166,1170 ****
return (HANDLE)mlist;
}
! }while(pp=pp->prev);
}
pm=my_mreq(sizeof(pthread_mutex_t), 0);
--- 1166,1170 ----
return (HANDLE)mlist;
}
! }while((pp=pp->prev));
}
pm=my_mreq(sizeof(pthread_mutex_t), 0);
***************
*** 1601,1607 ****
return result;
}
void* WINAPI expGetProcAddress(HMODULE mod, char* name)
{
! int result;
if(mod!=0x120)
result=GetProcAddress(mod, name);
--- 1601,1608 ----
return result;
}
+ void* LookupExternalByName(const char* library, const char* name);
void* WINAPI expGetProcAddress(HMODULE mod, char* name)
{
! void *result;
if(mod!=0x120)
result=GetProcAddress(mod, name);
***************
*** 1848,1855 ****
return result;
}
! int expstrcpy(char* str1, const char* str2)
{
! int result=strcpy(str1, str2);
! dbgprintf("strcpy(0x%x, 0x%x='%s') => %d\n", str1, str2, str2, result);
return result;
}
--- 1849,1856 ----
return result;
}
! void *expstrcpy(char* str1, const char* str2)
{
! void *result=strcpy(str1, str2);
! dbgprintf("strcpy(0x%x, 0x%x='%s') => %p\n", str1, str2, str2, result);
return result;
}
***************
*** 1860,1873 ****
return result;
}
! int expstrcat(char* str1, const char* str2)
{
! int result=strcat(str1, str2);
! dbgprintf("strcat(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
return result;
}
! int expmemmove(void* dest, void* src, int n)
{
! int result=memmove(dest, src, n);
! dbgprintf("memmove(0x%x, 0x%x, %d) => %d\n", dest, src, n, result);
return memmove;
}
--- 1861,1874 ----
return result;
}
! void *expstrcat(char* str1, const char* str2)
{
! void *result=strcat(str1, str2);
! dbgprintf("strcat(0x%x='%s', 0x%x='%s') => %p\n", str1, str1, str2, str2, result);
return result;
}
! void *expmemmove(void* dest, void* src, int n)
{
! void *result=memmove(dest, src, n);
! dbgprintf("memmove(0x%x, 0x%x, %d) => %p\n", dest, src, n, result);
return memmove;
}
***************
*** 1878,1885 ****
return result;
}
! int expmemcpy(void* dest, void* src, int n)
{
! int result=memcpy(dest, src, n);
! dbgprintf("memcpy(0x%x, 0x%x, %d) => %x\n", dest, src, n, result);
return result;
}
--- 1879,1886 ----
return result;
}
! void *expmemcpy(void* dest, void* src, int n)
{
! void *result=memcpy(dest, src, n);
! dbgprintf("memcpy(0x%x, 0x%x, %d) => %p\n", dest, src, n, result);
return result;
}
***************
*** 1893,1897 ****
int WINAPI expStringFromGUID2(GUID* guid, char* str, int cbMax)
{
! int result=snprintf(str, cbMax, "%.8x-%.4x-%.4x-%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
guid->f1, guid->f2, guid->f3,
(unsigned char)guid->f4[0], (unsigned char)guid->f4[1], (unsigned char)guid->f4[2], (unsigned char)guid->f4[3],
--- 1894,1898 ----
int WINAPI expStringFromGUID2(GUID* guid, char* str, int cbMax)
{
! int result=snprintf(str, cbMax, "%.8lx-%.4x-%.4x-%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
guid->f1, guid->f2, guid->f3,
(unsigned char)guid->f4[0], (unsigned char)guid->f4[1], (unsigned char)guid->f4[2], (unsigned char)guid->f4[3],
***************
*** 2696,2700 ****
alccnt--;
}
! printf("Total Unfree %d bytes cnt %d [%x,%d]\n",unfree,unfreecnt,alclist,alccnt);
#endif
}
--- 2697,2701 ----
alccnt--;
}
! printf("Total Unfree %d bytes cnt %d [%p,%d]\n",unfree,unfreecnt,alclist,alccnt);
#endif
}
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
- Previous message: [Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.14,1.15
- Next message: [Mplayer-cvslog] CVS: main mplayer.c,1.94,1.95 stream.h,1.2,1.3 stream.c,1.5,1.6 demuxer.c,1.5,1.6 vcd_read.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list