[Xbplayer-developers] XBMP/mplayerlibs/libDLL loadlib.cpp,1.7,1.8 registry.c,1.3,1.4 wrapper.cpp,1.5,1.6 libDLL.plg,1.5,1.6

[<ya...@us...>]

Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv21532/mplayerlibs/libDLL

Modified Files:
	loadlib.cpp registry.c wrapper.cpp libDLL.plg 
Log Message:
fixed wmv8

Index: loadlib.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/loadlib.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** loadlib.cpp	3 Jan 2003 22:14:05 -0000	1.7
--- loadlib.cpp	4 Jan 2003 09:39:09 -0000	1.8
***************
*** 110,116 ****
  }
  
  static WIN_BOOL __stdcall expIsProcessorFeaturePresent(DWORD v)
  {
! 	mp_msg(0,0,"expIsProcessorFeaturePresent");
      return FALSE;
  }
--- 110,128 ----
  }
  
[...1726 lines suppressed...]
          FF(GetWindowLongA, -1)
  				FF(SetWindowLongA, -1)
  				FF(DestroyWindow,-1)
  				FF(ShowWindow,-1)
! 				FF(InvalidateRect,-1)
          FF(EnumWindows, -1)
          FF(GetWindowThreadProcessId, -1)
***************
*** 2099,2103 ****
  
          FF(MessageBeep, -1)
!         FF(DialogBoxParamA, -1)*/
      };
  struct   exports  exp_msvcrt[] =
--- 2242,2246 ----
  
          FF(MessageBeep, -1)
!         FF(DialogBoxParamA, -1)
      };
  struct   exports  exp_msvcrt[] =

Index: registry.c
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/registry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** registry.c	3 Jan 2003 22:38:24 -0000	1.3
--- registry.c	4 Jan 2003 09:39:09 -0000	1.4
***************
*** 95,99 ****
      if (fd == -1)
      {
!         mp_msg(0,0,"Creating new registry\n");
          create_registry
          ();
--- 95,99 ----
      if (fd == -1)
      {
!         //mp_msg(0,0,"Creating new registry\n");
          create_registry
          ();
***************
*** 295,299 ****
          free(v->name);
      }
!     mp_msg(0,0,"RegInsert '%s'  %p  v:%d  len:%d\n", name, value, *(int*)value, len);
      v->type=type;
      v->len=len;
--- 295,299 ----
          free(v->name);
      }
!     //mp_msg(0,0,"RegInsert '%s'  %p  v:%d  len:%d\n", name, value, *(int*)value, len);
      v->type=type;
      v->len=len;
***************
*** 311,315 ****
  (void)
  {
!     mp_msg(0,0,"Initializing registry\n");
      // can't be free-ed - it's static and probably thread
      // unsafe structure which is stored in glibc
--- 311,315 ----
  (void)
  {
!     //mp_msg(0,0,"Initializing registry\n");
      // can't be free-ed - it's static and probably thread
      // unsafe structure which is stored in glibc
***************
*** 348,352 ****
      reg_handle_t* t;
      struct reg_value* v;
!     mp_msg(0,0,"Opening key %s\n", subkey);
  
      if(!regs)
--- 348,352 ----
      reg_handle_t* t;
      struct reg_value* v;
!     //mp_msg(0,0,"Opening key %s\n", subkey);
  
      if(!regs)
***************
*** 365,369 ****
      if(!full_name)
          return -1;
!     mp_msg(0,0,"Opening key Fullname %s\n", full_name);
      v=find_value_by_name(full_name);
  
--- 365,369 ----
      if(!full_name)
          return -1;
!     //mp_msg(0,0,"Opening key Fullname %s\n", full_name);
      v=find_value_by_name(full_name);
  
***************
*** 400,404 ****
      struct reg_value* t;
      char* c;
!     mp_msg(0,0,"Querying value %s\n", value);
      if(!regs)
          init_registry
--- 400,404 ----
      struct reg_value* t;
      char* c;
!     //mp_msg(0,0,"Querying value %s\n", value);
      if(!regs)
          init_registry
***************
*** 417,421 ****
      {
          memcpy(data, t->value, (t->len<*count)?t->len:*count);
!         mp_msg(0,0,"returning %d bytes: %d\n", t->len, *(int*)data);
      }
      if(*count<t->len)
--- 417,421 ----
      {
          memcpy(data, t->value, (t->len<*count)?t->len:*count);
!         //mp_msg(0,0,"returning %d bytes: %d\n", t->len, *(int*)data);
      }
      if(*count<t->len)
***************
*** 445,449 ****
      if (!fullname)
          return 1;
!     mp_msg(0,0,"Creating/Opening key %s\n", fullname);
      v=find_value_by_name(fullname);
      if(v==0)
--- 445,449 ----
      if (!fullname)
          return 1;
!     //mp_msg(0,0,"Creating/Opening key %s\n", fullname);
      v=find_value_by_name(fullname);
      if(v==0)
***************
*** 503,507 ****
  //    struct reg_value* t;
      char* c;
!     mp_msg(0,0,"Request to set value %s %d\n", name, *(const int*)data);
      if(!regs)
          init_registry
--- 503,507 ----
  //    struct reg_value* t;
      char* c;
!     //mp_msg(0,0,"Request to set value %s %d\n", name, *(const int*)data);
      if(!regs)
          init_registry

Index: wrapper.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/wrapper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wrapper.cpp	3 Jan 2003 21:45:07 -0000	1.5
--- wrapper.cpp	4 Jan 2003 09:39:09 -0000	1.6
***************
*** 46,50 ****
  BOOL  __stdcall expDisableThreadLibraryCalls(HANDLE module)
  {
!     mp_msg(0,0,"DisableThreadLibraryCalls(0x%x) => 0\n", module);
      return FALSE;
  }
--- 46,50 ----
  BOOL  __stdcall expDisableThreadLibraryCalls(HANDLE module)
  {
!     //mp_msg(0,0,"DisableThreadLibraryCalls(0x%x) => 0\n", module);
      return FALSE;
  }
***************
*** 64,68 ****
                                      DWORD dwFlags, DWORD* dwThreadId)
  {
! 	mp_msg(0,0,"expCreateThread\n");
  	return CreateThread((struct _SECURITY_ATTRIBUTES *)pSecAttr,dwStackSize,(LPTHREAD_START_ROUTINE )lpStartAddress,lpParameter,dwFlags,(LPDWORD)dwThreadId);
  }
--- 64,68 ----
                                      DWORD dwFlags, DWORD* dwThreadId)
  {
! 	//mp_msg(0,0,"expCreateThread\n");
  	return CreateThread((struct _SECURITY_ATTRIBUTES *)pSecAttr,dwStackSize,(LPTHREAD_START_ROUTINE )lpStartAddress,lpParameter,dwFlags,(LPDWORD)dwThreadId);
  }
***************
*** 70,74 ****
  HANDLE  __stdcall expCreateEventA(void* pSecAttr, BOOL bManualReset,BOOL bInitialState, const char* name)
  {
! 	mp_msg(0,0,"expCreateEvent\n");
  	return CreateEventA((struct _SECURITY_ATTRIBUTES *)pSecAttr, bManualReset,bInitialState, name);
  }
--- 70,74 ----
  HANDLE  __stdcall expCreateEventA(void* pSecAttr, BOOL bManualReset,BOOL bInitialState, const char* name)
  {
! 	//mp_msg(0,0,"expCreateEvent\n");
  	return CreateEventA((struct _SECURITY_ATTRIBUTES *)pSecAttr, bManualReset,bInitialState, name);
  }
***************
*** 76,85 ****
  BOOL  __stdcall expSetEvent(HANDLE event)
  {
! 	mp_msg(0,0,"expSetEvent\n");
  	return SetEvent(event);
  }
  BOOL  __stdcall expResetEvent(HANDLE event)
  {
! 	mp_msg(0,0,"expResetEvent\n");
  	return ResetEvent(event);
  }
--- 76,85 ----
  BOOL  __stdcall expSetEvent(HANDLE event)
  {
! 	//mp_msg(0,0,"expSetEvent\n");
  	return SetEvent(event);
  }
  BOOL  __stdcall expResetEvent(HANDLE event)
  {
! 	//mp_msg(0,0,"expResetEvent\n");
  	return ResetEvent(event);
  }
***************
*** 87,91 ****
  DWORD  __stdcall expHeapSize(HANDLE heap, DWORD flags, void* pointer)
  {
! 	mp_msg(0,0,"expHeapSize\n");
  	return HeapSize((HANDLE)heap, flags, pointer);
  }
--- 87,91 ----
  DWORD  __stdcall expHeapSize(HANDLE heap, DWORD flags, void* pointer)
  {
! 	//mp_msg(0,0,"expHeapSize\n");
  	return HeapSize((HANDLE)heap, flags, pointer);
  }
***************
*** 93,97 ****
   HANDLE  __stdcall expGetProcessHeap(void)
  {
! 	mp_msg(0,0,"expGetProcessHeap\n");
  	return GetProcessHeap();
  }
--- 93,97 ----
   HANDLE  __stdcall expGetProcessHeap(void)
  {
! 	//mp_msg(0,0,"expGetProcessHeap\n");
  	return GetProcessHeap();
  }
***************
*** 99,103 ****
  void*  __stdcall expHeapReAlloc(HANDLE heap,DWORD flags,void *lpMem,DWORD size)
  {
! 	mp_msg(0,0,"expHeapReAlloc\n");
  	return HeapReAlloc(heap,flags,lpMem,size);
  }
--- 99,103 ----
  void*  __stdcall expHeapReAlloc(HANDLE heap,DWORD flags,void *lpMem,DWORD size)
  {
! 	//mp_msg(0,0,"expHeapReAlloc\n");
  	return HeapReAlloc(heap,flags,lpMem,size);
  }
***************
*** 105,109 ****
  BOOL  __stdcall expHeapFree(HANDLE heap, DWORD dwFlags, LPVOID lpMem)
  {
! 	mp_msg(0,0,"expHeapFree\n");
  	return HeapFree(heap, dwFlags, lpMem);
  }
--- 105,109 ----
  BOOL  __stdcall expHeapFree(HANDLE heap, DWORD dwFlags, LPVOID lpMem)
  {
! 	//mp_msg(0,0,"expHeapFree\n");
  	return HeapFree(heap, dwFlags, lpMem);
  }
***************
*** 111,115 ****
  void*  __stdcall expHeapAlloc(HANDLE heap, DWORD flags, DWORD size)
  {
! 	mp_msg(0,0,"expHeapAlloc\n");
  	return HeapAlloc(heap, flags, size);
  }
--- 111,115 ----
  void*  __stdcall expHeapAlloc(HANDLE heap, DWORD flags, DWORD size)
  {
! 	//mp_msg(0,0,"expHeapAlloc\n");
  	return HeapAlloc(heap, flags, size);
  }
***************
*** 117,121 ****
  BOOL  __stdcall expHeapDestroy(HANDLE* heap)
  {
! 	mp_msg(0,0,"expHeapDestroy\n");
  	return HeapDestroy(heap);
  }
--- 117,121 ----
  BOOL  __stdcall expHeapDestroy(HANDLE* heap)
  {
! 	//mp_msg(0,0,"expHeapDestroy\n");
  	return HeapDestroy(heap);
  }
***************
*** 123,127 ****
  DWORD  __stdcall expWaitForSingleObject(HANDLE* object, DWORD duration)
  {
! 		mp_msg(0,0,"expWaitForSingleObject\n");
  		return WaitForSingleObject(object, duration);
  }
--- 123,127 ----
  DWORD  __stdcall expWaitForSingleObject(HANDLE* object, DWORD duration)
  {
! 		//mp_msg(0,0,"expWaitForSingleObject\n");
  		return WaitForSingleObject(object, duration);
  }
***************
*** 142,146 ****
  
  	SYSTEM_INFO* lpInfo=(SYSTEM_INFO*)si;
! 	mp_msg(0,0,"expGetSystemInfo\n");
  	*lpInfo=si_cache;
  }
--- 142,146 ----
  
  	SYSTEM_INFO* lpInfo=(SYSTEM_INFO*)si;
! 	//mp_msg(0,0,"expGetSystemInfo\n");
  	*lpInfo=si_cache;
  }
***************
*** 148,152 ****
  DWORD  __stdcall expGetVersion(void)
  {
! 	mp_msg(0,0,"expGetVersion\n");
      return 0xa280105;//Windows XP
  
--- 148,152 ----
  DWORD  __stdcall expGetVersion(void)
  {
! 	//mp_msg(0,0,"expGetVersion\n");
      return 0xa280105;//Windows XP
  
***************
*** 155,159 ****
  HANDLE  __stdcall expHeapCreate(DWORD flags, DWORD init_size, DWORD max_size)
  {
! 	mp_msg(0,0,"expHeapCreate\n");
  	return HeapCreate(flags, init_size, max_size);
  }
--- 155,159 ----
  HANDLE  __stdcall expHeapCreate(DWORD flags, DWORD init_size, DWORD max_size)
  {
! 	//mp_msg(0,0,"expHeapCreate\n");
  	return HeapCreate(flags, init_size, max_size);
  }
***************
*** 161,170 ****
  LPVOID __stdcall expVirtualAlloc(LPVOID addr,DWORD x,DWORD y ,DWORD z)
  {
! 	mp_msg(0,0,"expVirtualAlloc\n");
  	return VirtualAlloc(addr,x,y ,z);
  }
   BOOL	 __stdcall expVirtualFree(    LPVOID lpAddress,    DWORD dwSize,    DWORD dwFreeType    )
  {
! 	mp_msg(0,0,"expVirtualFree\n");
  	return VirtualFree(lpAddress,dwSize,dwFreeType);
  }
--- 161,170 ----
  LPVOID __stdcall expVirtualAlloc(LPVOID addr,DWORD x,DWORD y ,DWORD z)
  {
! 	//mp_msg(0,0,"expVirtualAlloc\n");
  	return VirtualAlloc(addr,x,y ,z);
  }
   BOOL	 __stdcall expVirtualFree(    LPVOID lpAddress,    DWORD dwSize,    DWORD dwFreeType    )
  {
! 	//mp_msg(0,0,"expVirtualFree\n");
  	return VirtualFree(lpAddress,dwSize,dwFreeType);
  }
***************
*** 172,176 ****
   void  __stdcall expInitializeCriticalSection(void* c)
  {
! 	//mp_msg(0,0,"expInitializeCriticalSection\n");
  	InitializeCriticalSection((CRITICAL_SECTION *)c);
  }
--- 172,176 ----
   void  __stdcall expInitializeCriticalSection(void* c)
  {
! 	////mp_msg(0,0,"expInitializeCriticalSection\n");
  	InitializeCriticalSection((CRITICAL_SECTION *)c);
  }
***************
*** 178,187 ****
   void  __stdcall expEnterCriticalSection(void* c)
  {
! 	//mp_msg(0,0,"expEnterCriticalSection\n");
  	EnterCriticalSection((CRITICAL_SECTION *)c);
  }
   void  __stdcall expLeaveCriticalSection(void* c)
  {
! 	//mp_msg(0,0,"expLeaveCriticalSection\n");
  	LeaveCriticalSection((CRITICAL_SECTION *)c);
  }
--- 178,187 ----
   void  __stdcall expEnterCriticalSection(void* c)
  {
! 	////mp_msg(0,0,"expEnterCriticalSection\n");
  	EnterCriticalSection((CRITICAL_SECTION *)c);
  }
   void  __stdcall expLeaveCriticalSection(void* c)
  {
! 	////mp_msg(0,0,"expLeaveCriticalSection\n");
  	LeaveCriticalSection((CRITICAL_SECTION *)c);
  }
***************
*** 189,193 ****
   void  __stdcall expDeleteCriticalSection(void *c)
  {
! 	//mp_msg(0,0,"expDeleteCriticalSection\n");
  	DeleteCriticalSection((CRITICAL_SECTION *)c);
  }
--- 189,193 ----
   void  __stdcall expDeleteCriticalSection(void *c)
  {
! 	////mp_msg(0,0,"expDeleteCriticalSection\n");
  	DeleteCriticalSection((CRITICAL_SECTION *)c);
  }
***************
*** 195,203 ****
   void*  expmalloc(int size)
  {
!     //mp_msg(0,0,"malloc");
      //    return malloc(size);
      void* result=malloc(size);
      if(result==0)
!         mp_msg(0,0,"WARNING: malloc() failed\n");
      return result;
  }
--- 195,203 ----
   void*  expmalloc(int size)
  {
!     ////mp_msg(0,0,"malloc");
      //    return malloc(size);
      void* result=malloc(size);
      if(result==0)
!         //mp_msg(0,0,"WARNING: malloc() failed\n");
      return result;
  }
***************
*** 205,209 ****
  {
      //    return free(mem);
!     //mp_msg(0,0,"free(%p)\n", mem);
      free(mem);
  }
--- 205,209 ----
  {
      //    return free(mem);
!     ////mp_msg(0,0,"free(%p)\n", mem);
      free(mem);
  }
***************
*** 212,216 ****
  {
  	int result=0;
! 	 mp_msg(0,0,"LoadStringA(instance 0x%x, id 0x%x, buffer 0x%x, size %d) => %d ( %s )\n",instance, id, buf, size, result, buf);
  	 return result;  
  }
--- 212,216 ----
  {
  	int result=0;
! 	 //mp_msg(0,0,"LoadStringA(instance 0x%x, id 0x%x, buffer 0x%x, size %d) => %d ( %s )\n",instance, id, buf, size, result, buf);
  	 return result;  
  }
***************
*** 218,222 ****
   long  __stdcall expRegCloseKey(HANDLE key)
  {
!     mp_msg(0,0,"RegCloseKey(0x%x)\n", key);
      return 0;
  }
--- 218,222 ----
   long  __stdcall expRegCloseKey(HANDLE key)
  {
!     //mp_msg(0,0,"RegCloseKey(0x%x)\n", key);
      return 0;
  }
***************
*** 225,229 ****
  {
      int dc = 0;//0x81;
!     mp_msg(0,0,"CreateCompatibleDC(%d) => %d\n", hdc, dc);
      return (HANDLE)dc;
  }
--- 225,229 ----
  {
      int dc = 0;//0x81;
!     //mp_msg(0,0,"CreateCompatibleDC(%d) => %d\n", hdc, dc);
      return (HANDLE)dc;
  }
***************
*** 231,235 ****
  DWORD  __stdcall expGetFileVersionInfoSizeA(const char* name, DWORD* lpHandle)
  {
!     mp_msg(0,0,"GetFileVersionInfoSizeA(0x%x='%s', 0x%X) => 0\n", name, name, lpHandle);
      return 0;
  }
--- 231,235 ----
  DWORD  __stdcall expGetFileVersionInfoSizeA(const char* name, DWORD* lpHandle)
  {
!     //mp_msg(0,0,"GetFileVersionInfoSizeA(0x%x='%s', 0x%X) => 0\n", name, name, lpHandle);
      return 0;
  }
***************
*** 237,241 ****
   HRESULT  __stdcall expCoCreateFreeThreadedMarshaler(void *pUnkOuter, void **ppUnkInner)
  {
!     mp_msg(0,0,"CoCreateFreeThreadedMarshaler(%p, %p) called!\n",pUnkOuter, ppUnkInner);
      //    return 0;
      return ERROR_CALL_NOT_IMPLEMENTED;
--- 237,241 ----
   HRESULT  __stdcall expCoCreateFreeThreadedMarshaler(void *pUnkOuter, void **ppUnkInner)
  {
!     //mp_msg(0,0,"CoCreateFreeThreadedMarshaler(%p, %p) called!\n",pUnkOuter, ppUnkInner);
      //    return 0;
      return ERROR_CALL_NOT_IMPLEMENTED;
***************
*** 245,249 ****
  {
      void *result = memcpy(dest, src, n);
!     mp_msg(0,0,"memcpy(0x%x, 0x%x, %d) => %p\n", dest, src, n, result);
      return result;
  }
--- 245,249 ----
  {
      void *result = memcpy(dest, src, n);
!     //mp_msg(0,0,"memcpy(0x%x, 0x%x, %d) => %p\n", dest, src, n, result);
      return result;
  }
***************
*** 259,263 ****
    unsigned long __stdcall exphtonl(unsigned long hostlong)
  {
!     //    mp_msg(0,0,"htonl(%x) => %x\n", hostlong, htonl(hostlong));
      return htonl(hostlong);
  }
--- 259,263 ----
    unsigned long __stdcall exphtonl(unsigned long hostlong)
  {
!     //    //mp_msg(0,0,"htonl(%x) => %x\n", hostlong, htonl(hostlong));
      return htonl(hostlong);
  }
***************
*** 265,269 ****
    unsigned long  __stdcall expntohl(unsigned long  netlong)
  {
!     //    mp_msg(0,0,"ntohl(%x) => %x\n", netlong, ntohl(netlong));
      return ntohl(netlong);
  }
--- 265,269 ----
    unsigned long  __stdcall expntohl(unsigned long  netlong)
  {
!     //    //mp_msg(0,0,"ntohl(%x) => %x\n", netlong, ntohl(netlong));
      return ntohl(netlong);
  }
***************
*** 271,285 ****
  void  __stdcall expVariantInit(void* p)
  {
!     mp_msg(0,0,"InitCommonControls called!\n");
      return;
  }
  void ext_stubs(void)
  {
! 	mp_msg(0,0,"ext_stubs\n");
  }
  
  int __stdcall expDefDriverProc(int _private, int id, int msg, int arg1, int arg2)
  {
!     mp_msg(0,0,"DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", _private, id, msg, arg1, arg2);
      return 0;
  }
--- 271,285 ----
  void  __stdcall expVariantInit(void* p)
  {
!     //mp_msg(0,0,"InitCommonControls called!\n");
      return;
  }
  void ext_stubs(void)
  {
! 	//mp_msg(0,0,"ext_stubs\n");
  }
  
  int __stdcall expDefDriverProc(int _private, int id, int msg, int arg1, int arg2)
  {
!     //mp_msg(0,0,"DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", _private, id, msg, arg1, arg2);
      return 0;
  }
***************
*** 292,296 ****
      va_start(va, format);
      result = vsprintf(string, format, va);
!     mp_msg(0,0,"ws//printfA(0x%x, '%s', ...) => %d\n", string, format, result);
      va_end(va);
      return result;
--- 292,296 ----
      va_start(va, format);
      result = vsprintf(string, format, va);
!     //mp_msg(0,0,"ws//printfA(0x%x, '%s', ...) => %d\n", string, format, result);
      va_end(va);
      return result;
***************
*** 301,305 ****
      va_list args;
      int r;
!     mp_msg(0,0,"smp_msg(0,0,%s, %s)\n", str, format);
      va_start(args, format);
      r = vsprintf(str, format, args);
--- 301,305 ----
      va_list args;
      int r;
!     //mp_msg(0,0,"s//mp_msg(0,0,%s, %s)\n", str, format);
      va_start(args, format);
      r = vsprintf(str, format, args);
***************
*** 311,315 ****
      va_list args;
      int r;
!     mp_msg(0,0,"sscanf(%s, %s)\n", str, format);
      va_start(args, format);
      r = sscanf(str, format, args);
--- 311,315 ----
      va_list args;
      int r;
!     //mp_msg(0,0,"sscanf(%s, %s)\n", str, format);
      va_start(args, format);
      r = sscanf(str, format, args);
***************
*** 322,326 ****
      va_list args;
      int r = 0;
!     mp_msg(0,0,"fmp_msg(0,0,%p, %s, ...)\n", stream, format);
  #if 1
      va_start(args, format);
--- 322,326 ----
      va_list args;
      int r = 0;
!     //mp_msg(0,0,"f//mp_msg(0,0,%p, %s, ...)\n", stream, format);
  #if 1
      va_start(args, format);
***************
*** 334,338 ****
      va_list args;
      int r;
!     mp_msg(0,0,"mp_msg(0,0,%s, ...)\n", format);
      va_start(args, format);
      r = vprintf(format, args);
--- 334,338 ----
      va_list args;
      int r;
!     //mp_msg(0,0,"//mp_msg(0,0,%s, ...)\n", format);
      va_start(args, format);
      r = vprintf(format, args);
***************
*** 363,372 ****
  DWORD __stdcall expGetCurrentThreadId()
  {
!     mp_msg(0,0,"GetCurrentThreadId()\n");
      return GetCurrentThreadId();
  }
  HANDLE __stdcall expGetCurrentProcess()
  {
!     mp_msg(0,0,"GetCurrentProcess() \n");
      return GetCurrentProcess();
  }
--- 363,372 ----
  DWORD __stdcall expGetCurrentThreadId()
  {
!     //mp_msg(0,0,"GetCurrentThreadId()\n");
      return GetCurrentThreadId();
  }
  HANDLE __stdcall expGetCurrentProcess()
  {
!     //mp_msg(0,0,"GetCurrentProcess() \n");
      return GetCurrentProcess();
  }
***************
*** 375,379 ****
  	HANDLE hMem=LocalAlloc(flags, size);
    if(!hMem) 
! 		mp_msg(0,0,"expLocalAlloc() failed\n");
    return hMem;
  }
--- 375,379 ----
  	HANDLE hMem=LocalAlloc(flags, size);
    if(!hMem) 
! 		//mp_msg(0,0,"expLocalAlloc() failed\n");
    return hMem;
  }
***************
*** 382,386 ****
  {
  
!     mp_msg(0,0,"expLocalReAlloc()\n");
      return LocalReAlloc(handle,flags, size);
  }
--- 382,386 ----
  {
  
!     //mp_msg(0,0,"expLocalReAlloc()\n");
      return LocalReAlloc(handle,flags, size);
  }
***************
*** 388,392 ****
  void* __stdcall expLocalLock(HANDLE* z)
  {
!     mp_msg(0,0,"LocalLock(0x%x) => 0x%x\n", z, z);
      return LocalLock(z);
  }
--- 388,392 ----
  void* __stdcall expLocalLock(HANDLE* z)
  {
!     //mp_msg(0,0,"LocalLock(0x%x) => 0x%x\n", z, z);
      return LocalLock(z);
  }
***************
*** 394,413 ****
  HANDLE  __stdcall expGlobalAlloc(unsigned int flags, DWORD size)
  {
!     mp_msg(0,0,"GlobalAlloc(\n");
      return GlobalAlloc( flags,size);
  }
   void*  __stdcall expGlobalLock(HANDLE* z)
  {
!     mp_msg(0,0,"GlobalLock(0x%x)\n ", z);
      return GlobalLock( z);
  }
  DWORD  __stdcall expGlobalSize(HANDLE* amem)
  {
!     mp_msg(0,0,"expGlobalSize(0x%x)\n ", amem);
      return GlobalSize( amem);
  }
  HANDLE  __stdcall expGlobalReAlloc(HANDLE v, DWORD size, unsigned int flags)
  {
!     mp_msg(0,0,"GlobalReAlloc\n ");
      return GlobalReAlloc(v, size, flags);
  }
--- 394,413 ----
  HANDLE  __stdcall expGlobalAlloc(unsigned int flags, DWORD size)
  {
!     //mp_msg(0,0,"GlobalAlloc(\n");
      return GlobalAlloc( flags,size);
  }
   void*  __stdcall expGlobalLock(HANDLE* z)
  {
!     //mp_msg(0,0,"GlobalLock(0x%x)\n ", z);
      return GlobalLock( z);
  }
  DWORD  __stdcall expGlobalSize(HANDLE* amem)
  {
!     //mp_msg(0,0,"expGlobalSize(0x%x)\n ", amem);
      return GlobalSize( amem);
  }
  HANDLE  __stdcall expGlobalReAlloc(HANDLE v, DWORD size, unsigned int flags)
  {
!     //mp_msg(0,0,"GlobalReAlloc\n ");
      return GlobalReAlloc(v, size, flags);
  }
***************
*** 415,419 ****
  int __stdcall expMultiByteToWideChar(unsigned int v1, DWORD v2, char* s1, int siz1, short* s2, int siz2)
  {
!     mp_msg(0,0,"expMultiByteToWideChar\n ");
  	return MultiByteToWideChar(v1, v2, s1, siz1, (unsigned short*)s2, siz2);
  }
--- 415,419 ----
  int __stdcall expMultiByteToWideChar(unsigned int v1, DWORD v2, char* s1, int siz1, short* s2, int siz2)
  {
!     //mp_msg(0,0,"expMultiByteToWideChar\n ");
  	return MultiByteToWideChar(v1, v2, s1, siz1, (unsigned short*)s2, siz2);
  }
***************
*** 422,426 ****
   HANDLE  __stdcall expCreateSemaphoreA(void* v1, long init_count, long max_count, char* name)
  {
!     mp_msg(0,0,"expCreateSemaphoreA\n ");
  	return CreateSemaphoreA( (struct _SECURITY_ATTRIBUTES *)v1,  init_count,  max_count,  name);
  }
--- 422,426 ----
   HANDLE  __stdcall expCreateSemaphoreA(void* v1, long init_count, long max_count, char* name)
  {
!     //mp_msg(0,0,"expCreateSemaphoreA\n ");
  	return CreateSemaphoreA( (struct _SECURITY_ATTRIBUTES *)v1,  init_count,  max_count,  name);
  }
***************
*** 428,432 ****
  BOOL  __stdcall expReleaseSemaphore(HANDLE hsem, long increment, long* prev_count)
  {
!     mp_msg(0,0,"expReleaseSemaphore\n ");
      return ReleaseSemaphore((void*)hsem, increment, prev_count);
  }
--- 428,432 ----
  BOOL  __stdcall expReleaseSemaphore(HANDLE hsem, long increment, long* prev_count)
  {
!     //mp_msg(0,0,"expReleaseSemaphore\n ");
      return ReleaseSemaphore((void*)hsem, increment, prev_count);
  }
***************
*** 436,445 ****
  {
  
!     mp_msg(0,0,"expWideCharToMultiByte\n ");
      return WideCharToMultiByte(v1, v2, (const unsigned short *)s1, siz1,s2, siz2, c3, siz3);
  }
  BOOL __stdcall expQueryPerformanceFrequency(void* z)
  {
!     mp_msg(0,0,"expQueryPerformanceFrequency\n ");
  	return QueryPerformanceFrequency((LARGE_INTEGER*)z);
  }
--- 436,445 ----
  {
  
!     //mp_msg(0,0,"expWideCharToMultiByte\n ");
      return WideCharToMultiByte(v1, v2, (const unsigned short *)s1, siz1,s2, siz2, c3, siz3);
  }
  BOOL __stdcall expQueryPerformanceFrequency(void* z)
  {
!     //mp_msg(0,0,"expQueryPerformanceFrequency\n ");
  	return QueryPerformanceFrequency((LARGE_INTEGER*)z);
  }
***************
*** 447,456 ****
  HANDLE  __stdcall expLocalHandle(void* v)
  {
!     mp_msg(0,0,"expLocalHandle\n ");
  	return LocalHandle(v);
  }
  BOOL  __stdcall expLocalUnlock(HANDLE v)
  {
!     mp_msg(0,0,"expLocalUnlock\n ");
  	return LocalUnlock(v);
  }
--- 447,456 ----
  HANDLE  __stdcall expLocalHandle(void* v)
  {
!     //mp_msg(0,0,"expLocalHandle\n ");
  	return LocalHandle(v);
  }
  BOOL  __stdcall expLocalUnlock(HANDLE v)
  {
!     //mp_msg(0,0,"expLocalUnlock\n ");
  	return LocalUnlock(v);
  }
***************
*** 458,462 ****
  HANDLE  __stdcall expLocalFree(HANDLE v)
  {
!     mp_msg(0,0,"expLocalFree\n ");
  	return LocalFree(v);
  }
--- 458,462 ----
  HANDLE  __stdcall expLocalFree(HANDLE v)
  {
!     //mp_msg(0,0,"expLocalFree\n ");
  	return LocalFree(v);
  }
***************
*** 464,473 ****
  HANDLE  __stdcall expGlobalHandle(void* v)
  {
!     mp_msg(0,0,"expGlobalHandle\n ");
  	return GlobalHandle(v);
  }
  BOOL  __stdcall expGlobalUnlock(HANDLE v)
  {
!     mp_msg(0,0,"expGlobalUnlock\n ");
  	return GlobalUnlock(v);
  }
--- 464,473 ----
  HANDLE  __stdcall expGlobalHandle(void* v)
  {
!     //mp_msg(0,0,"expGlobalHandle\n ");
  	return GlobalHandle(v);
  }
  BOOL  __stdcall expGlobalUnlock(HANDLE v)
  {
!     //mp_msg(0,0,"expGlobalUnlock\n ");
  	return GlobalUnlock(v);
  }
***************
*** 475,489 ****
  HANDLE  __stdcall expGlobalFree(HANDLE v)
  {
!     mp_msg(0,0,"expGlobalFree\n ");
  	return GlobalFree(v);
  }
  BOOL __stdcall expCloseHandle(HANDLE v1)
  {
!     mp_msg(0,0,"expCloseHandle\n ");
  	return CloseHandle((void*)v1);
  }
  DWORD  __stdcall expGetLastError()
  {
!     mp_msg(0,0,"expGetLastError\n ");
      return GetLastError();
  }
--- 475,489 ----
  HANDLE  __stdcall expGlobalFree(HANDLE v)
  {
!     //mp_msg(0,0,"expGlobalFree\n ");
  	return GlobalFree(v);
  }
  BOOL __stdcall expCloseHandle(HANDLE v1)
  {
!     //mp_msg(0,0,"expCloseHandle\n ");
  	return CloseHandle((void*)v1);
  }
  DWORD  __stdcall expGetLastError()
  {
!     //mp_msg(0,0,"expGetLastError\n ");
      return GetLastError();
  }
***************
*** 491,500 ****
   void  __stdcall expSetLastError(DWORD error)
  {
!     mp_msg(0,0,"expSetLastError\n ");
      SetLastError(error);
  }
  void  __stdcall expGlobalMemoryStatus(void* lpmem)
  {
!     mp_msg(0,0,"expGlobalMemoryStatus\n ");
      GlobalMemoryStatus((LPMEMORYSTATUS)lpmem);
  }
--- 491,500 ----
   void  __stdcall expSetLastError(DWORD error)
  {
!     //mp_msg(0,0,"expSetLastError\n ");
      SetLastError(error);
  }
  void  __stdcall expGlobalMemoryStatus(void* lpmem)
  {
!     //mp_msg(0,0,"expGlobalMemoryStatus\n ");
      GlobalMemoryStatus((LPMEMORYSTATUS)lpmem);
  }
***************
*** 502,506 ****
  BOOL  __stdcall expSetThreadPriority(HANDLE hthread,INT priority)   
  {
!     mp_msg(0,0,"expSetThreadPriority\n ");
      return SetThreadPriority(hthread,priority);
  }
--- 502,506 ----
  BOOL  __stdcall expSetThreadPriority(HANDLE hthread,INT priority)   
  {
!     //mp_msg(0,0,"expSetThreadPriority\n ");
      return SetThreadPriority(hthread,priority);
  }
***************
*** 508,522 ****
   void __stdcall expExitProcess( unsigned int status )
  {
!     mp_msg(0,0,"EXIT - code %ld\n",status);
      
  }
   DWORD  __stdcall expGetCurrentProcessId(void)
  {
!     mp_msg(0,0,"expGetCurrentProcessId\n ");
      return 1;
  }
  DWORD  __stdcall expSetThreadAffinityMask(HANDLE hThread,DWORD dwThreadAffinityMask)
  {
!     mp_msg(0,0,"expSetThreadAffinityMask\n ");
      return 0;
  }
--- 508,522 ----
   void __stdcall expExitProcess( unsigned int status )
  {
!     //mp_msg(0,0,"EXIT - code %ld\n",status);
      
  }
   DWORD  __stdcall expGetCurrentProcessId(void)
  {
!     //mp_msg(0,0,"expGetCurrentProcessId\n ");
      return 1;
  }
  DWORD  __stdcall expSetThreadAffinityMask(HANDLE hThread,DWORD dwThreadAffinityMask)
  {
!     //mp_msg(0,0,"expSetThreadAffinityMask\n ");
      return 0;
  }
***************
*** 527,536 ****
  int __stdcall expMulDiv(int nNumber, int nNumerator, int nDenominator)
  {
! 	mp_msg(0,0,"expMulDiv()\n");
  	return MulDiv(nNumber, nNumerator, nDenominator);
  }
  void __stdcall expSleep(DWORD time)
  {
! 	mp_msg(0,0,"Sleep()\n");
  	Sleep(time);
  }
--- 527,536 ----
  int __stdcall expMulDiv(int nNumber, int nNumerator, int nDenominator)
  {
! 	//mp_msg(0,0,"expMulDiv()\n");
  	return MulDiv(nNumber, nNumerator, nDenominator);
  }
  void __stdcall expSleep(DWORD time)
  {
! 	//mp_msg(0,0,"Sleep()\n");
  	Sleep(time);
  }
***************
*** 538,542 ****
  LONG  __stdcall expInterlockedIncrement(PLONG pl)
  {
! 	mp_msg(0,0,"expInterlockedIncrement\n");
  	return InterlockedIncrement(pl);
  }
--- 538,542 ----
  LONG  __stdcall expInterlockedIncrement(PLONG pl)
  {
! 	//mp_msg(0,0,"expInterlockedIncrement\n");
  	return InterlockedIncrement(pl);
  }
***************
*** 544,548 ****
  LONG   __stdcall expInterlockedDecrement(PLONG pl)
  {
! 	mp_msg(0,0,"expInterlockedDecrement\n");
  	return InterlockedDecrement(pl);
  }
--- 544,548 ----
  LONG   __stdcall expInterlockedDecrement(PLONG pl)
  {
! 	//mp_msg(0,0,"expInterlockedDecrement\n");
  	return InterlockedDecrement(pl);
  }

Index: libDLL.plg
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/libDLL.plg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** libDLL.plg	3 Jan 2003 22:14:06 -0000	1.5
--- libDLL.plg	4 Jan 2003 09:39:09 -0000	1.6
***************
*** 7,43 ****
  </h3>
  <h3>Command Lines</h3>
- Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP612.tmp" with contents
- [
- /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_XBOX" /D "NDEBUG" /Fo"Release/" /Fd"Release/" /FD /G6 /Ztmp /c 
- "D:\xbmpv2\XBMP\mplayerlibs\libDLL\loadlib.cpp"
- ]
- Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP612.tmp" 
- Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP613.tmp" with contents
- [
- /nologo /out:"Release\libDLL.lib" 
- .\Release\allocator.obj
- .\Release\buffer.obj
- .\Release\cmediasample.obj
- .\Release\com.obj
- .\Release\dmo.obj
- .\Release\DMO_AudioDecoder.obj
- .\Release\dmo_guids.obj
- .\Release\DMO_VideoDecoder.obj
- .\Release\DS_AudioDecoder.obj
- .\Release\DS_Filter.obj
- .\Release\DS_VideoDecoder.obj
- .\Release\guids.obj
- .\Release\inputpin.obj
- .\Release\loadlib.obj
- .\Release\module.obj
- .\Release\outputpin.obj
- .\Release\wrapper.obj
- .\Release\registry.obj
- ]
- Creating command line "link.exe -lib @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP613.tmp"
- <h3>Output Window</h3>
- Compiling...
- loadlib.cpp
- Creating library...
  
  
--- 7,10 ----
***************
*** 49,85 ****
  </h3>
  <h3>Command Lines</h3>
- Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP614.tmp" with contents
- [
- /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fo"Debug/" /Fd"Debug/" /FD /G6 /Ztmp /c 
- "D:\xbmpv2\XBMP\mplayerlibs\libDLL\loadlib.cpp"
- ]
- Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP614.tmp" 
- Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP615.tmp" with contents
- [
- /nologo /out:"Debug\libDLLd.lib" 
- .\Debug\allocator.obj
- .\Debug\buffer.obj
- .\Debug\cmediasample.obj
- .\Debug\com.obj
- .\Debug\dmo.obj
- .\Debug\DMO_AudioDecoder.obj
- .\Debug\dmo_guids.obj
- .\Debug\DMO_VideoDecoder.obj
- .\Debug\DS_AudioDecoder.obj
- .\Debug\DS_Filter.obj
- .\Debug\DS_VideoDecoder.obj
- .\Debug\guids.obj
- .\Debug\inputpin.obj
- .\Debug\loadlib.obj
- .\Debug\module.obj
- .\Debug\outputpin.obj
- .\Debug\wrapper.obj
- .\Debug\registry.obj
- ]
- Creating command line "link.exe -lib @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP615.tmp"
- <h3>Output Window</h3>
- Compiling...
- loadlib.cpp
- Creating library...
  
  
--- 16,19 ----