[Mplayer-cvslog] CVS: main/loader stubs.s,1.1.1.1,1.2 win32.c,1.10,1.11

[GEREOFFY]

Update of /cvsroot/mplayer/main/loader
In directory usw-pr-cvs1:/tmp/cvs-serv10184/loader

Modified Files:
	stubs.s win32.c 
Log Message:
avifile-0.6-CVS merge

Index: stubs.s
===================================================================
RCS file: /cvsroot/mplayer/main/loader/stubs.s,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** stubs.s	2001/02/24 20:30:26	1.1.1.1
--- stubs.s	2001/05/06 21:43:45	1.2
***************
*** 1,9 ****
  	.file	"stubs.c"
! 	.version	"01.01"
  gcc2_compiled.:
  .section	.rodata
  .LC0:
  	.string	"Called unk_%s\n"
! .text
  	.align 4
  .globl unk_exp1
--- 1,9 ----
  	.file	"stubs.c"
! 	.version  "01.01"
  gcc2_compiled.:
  .section	.rodata
  .LC0:
  	.string	"Called unk_%s\n"
! .data
  	.align 4
  .globl unk_exp1

Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** win32.c	2001/04/23 20:16:37	1.10
--- win32.c	2001/05/06 21:43:45	1.11
***************
*** 1578,1581 ****
--- 1578,1601 ----
      char qq[256];
      int result;
+     char* lastbc;
+     if (!name)
+ 	return -1;
+     // we skip to the last backslash
+     // this is effectively eliminating weird characters in
+     // the text output windows
+     lastbc = strrchr(name, '\\');
+     if (lastbc)
+     {
+         int i;
+         lastbc++;
+ 	for (i = 0; 1 ;i++)
+ 	{
+ 	    name[i] = *lastbc++;
+ 	    if (!name[i])
+ 		break;
+ 	}
+     }
+ //    printf("LoadLibrary wants: %s/%s\n", def_path, name);
+ 
      if(strncmp(name, "c:\\windows\\", 11)==0)name+=11;
      if(name[0]!='/')
***************
*** 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;
  }
--- 1869,1876 ----
      return result; 
  }
! int expstrcpy(char* str1, const char* str2) 
  {
!     int result= (int) strcpy(str1, str2);
!     dbgprintf("strcpy(0x%x, 0x%x='%s') => %d\n", str1, str2, str2, result);
      return result;
  }
***************
*** 1860,1875 ****
      dbgprintf("strcmp(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
      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;
  }
  int expmemcmp(void* dest, void* src, int n) 
--- 1880,1901 ----
      dbgprintf("strcmp(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
      return result;
+ }
+ int expstrcat(char* str1, const char* str2) 
+ {
+     int result= (int) strcat(str1, str2);
+     dbgprintf("strcat(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
+     return result;    
  }
! int expisalnum(int c)
  {
!     int result= (int) isalnum(c);
!     dbgprintf("isalnum(0x%x='%c' => %d\n", c, c, result);
      return result;    
  }
! int expmemmove(void* dest, void* src, int n) 
  {
!     int result= (int) memmove(dest, src, n);
!     dbgprintf("memmove(0x%x, 0x%x, %d) => %d\n", dest, src, n, result);
!     return result;
  }
  int expmemcmp(void* dest, void* src, int n) 
***************
*** 1917,1920 ****
--- 1943,1956 ----
      return result;
  }    
+ 
+ int WINAPI expIsBadStringPtrA(const char* string, int nchars)
+ {
+     int result;
+ //    if(string==0)result=1; else result=0;
+ //    dbgprintf("IsBadStringPtrW(0x%x, %d) => %d", string, nchars, result);
+ //    if(string)wch_print(string);
+     return result;
+ }    
+ 
  extern long WINAPI InterlockedExchangeAdd( long* dest, long incr )
  {
***************
*** 2350,2371 ****
  }
   
- 
  
! LONG WINAPI expInterlockedExchange(long *dest, long l)
  {
! 	long retval;
! 	retval = *dest;
! 	*dest = l;
! 	return retval;
  }
  
! INT WINAPI expMulDiv(int nNumber,int nNumerator,int nDenominator)
  {
! 	return ((long long)nNumber * (long long)nNumerator) / nDenominator;
  }
  
  
  
  
  
  struct exports
--- 2386,2437 ----
  }
   
  
! #if 0
! INT WINAPI expMulDiv(int nNumber,int nNumerator,int nDenominator)
  {
! 	return ((long long)nNumber * (long long)nNumerator) / nDenominator;
  }
+ #endif
  
! int WINAPI expMulDiv(int nNumber, int nNumerator, int nDenominator)
  {
!     static const long long max_int=0x7FFFFFFFLL;
!     static const long long min_int=-0x80000000LL;
!     long long tmp=(long long)nNumber*(long long)nNumerator;
!     if(!nDenominator)return 1;
!     tmp/=nDenominator;
!     if(tmp<min_int) return 1;
!     if(tmp>max_int) return 1;
!     return (int)tmp;
  }
  
+ LONG WINAPI explstrcmpiA(const char* str1, const char* str2)
+ {
+     LONG result=strcasecmp(str1, str2);
+     dbgprintf("strcmpi(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
+     return result;
+ }
  
+ LONG WINAPI explstrlenA(const char* str1)
+ {
+     LONG result=strlen(str1);
+     dbgprintf("strlen(0x%x='%s') => %d\n", str1, str1, result);
+     return result;
+ }
  
+ LONG WINAPI explstrcpyA(char* str1, const char* str2)
+ {
+     int result= (int) strcpy(str1, str2);
+     dbgprintf("strcpy(0x%x, 0x%x='%s') => %d\n", str1, str2, str2, result);
+     return result;
+ }
  
+ LONG WINAPI expInterlockedExchange(long *dest, long l)
+ {
+ 	long retval;
+ 	retval = *dest;
+ 	*dest = l;
+ 	return retval;
+ }
  
  struct exports
***************
*** 2389,2392 ****
--- 2455,2459 ----
  FF(IsBadReadPtr, 354)
  FF(IsBadStringPtrW, -1)
+ FF(IsBadStringPtrA, -1)
  FF(DisableThreadLibraryCalls, -1)
  FF(CreateThread, -1)
***************
*** 2494,2497 ****
--- 2561,2567 ----
  FF(InterlockedExchange, -1)
  FF(MulDiv, -1)
+ FF(lstrcmpiA, -1)
+ FF(lstrlenA, -1)
+ FF(lstrcpyA, -1)
  };
  
***************
*** 2509,2515 ****
  FF(strcmp, -1)
  FF(strcat, -1)
  FF(memmove, -1)
  FF(memcmp, -1)
- //FF(memcpy, -1)
  FF(time, -1)
  };
--- 2579,2585 ----
  FF(strcmp, -1)
  FF(strcat, -1)
+ FF(isalnum, -1)
  FF(memmove, -1)
  FF(memcmp, -1)
  FF(time, -1)
  };


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog