[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h, 1.75, 1.76 int_table.c, 1.78, 1.79 lib_file.c, 1.10, 1.11

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv26394/engine

Modified Files:
        int_proto.h int_table.c lib_file.c 
Log Message:


Stub out the internalcalls for "FileMethods.Lock" and "FileMethods.Unlock".


Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** int_proto.h 13 Aug 2003 02:14:22 -0000      1.75
--- int_proto.h 19 Aug 2003 05:09:13 -0000      1.76
***************
*** 466,470 ****
  extern ILString * _IL_DirMethods_GetSystemDirectory(ILExecThread * _thread);
  extern System_Array * _IL_DirMethods_GetLogicalDrives(ILExecThread * _thread);
- extern ILString * _IL_DirMethods_GetCurrentDirectory(ILExecThread * _thread);
  extern void _IL_DirMethods_GetPathInfo(ILExecThread * _thread, void * 
_result);
  extern ILInt32 _IL_DirMethods_Delete(ILExecThread * _thread, ILString * _p1);
--- 466,469 ----
***************
*** 473,476 ****
--- 472,476 ----
  extern ILInt32 _IL_DirMethods_GetLastModification(ILExecThread * _thread, 
ILString * _p1, ILInt64 * last_mod);
  extern ILInt32 _IL_DirMethods_GetFilesInDirectory(ILExecThread * _thread, 
ILString * _p1, System_Array * * files);
+ extern ILString * _IL_DirMethods_GetCurrentDirectory(ILExecThread * _thread);
  extern ILInt32 _IL_DirMethods_ChangeDirectory(ILExecThread * _thread, 
ILString * _p1);
  extern ILInt32 _IL_DirMethods_Rename(ILExecThread * _thread, ILString * _p1, 
ILString * _p2);
***************
*** 519,522 ****
--- 519,524 ----
  extern ILInt32 _IL_FileMethods_Read(ILExecThread * _thread, ILNativeInt _p1, 
System_Array * _p2, ILInt32 _p3, ILInt32 _p4);
  extern ILBool _IL_FileMethods_SetLength(ILExecThread * _thread, ILNativeInt 
_p1, ILInt64 _p2);
+ extern ILBool _IL_FileMethods_Lock(ILExecThread * _thread, ILNativeInt _p1, 
ILInt64 _p2, ILInt64 _p3);
+ extern ILBool _IL_FileMethods_Unlock(ILExecThread * _thread, ILNativeInt _p1, 
ILInt64 _p2, ILInt64 _p3);
  extern ILNativeInt _IL_FileMethods_GetInvalidHandle(ILExecThread * _thread);
  extern ILInt32 _IL_FileMethods_GetFileType(ILExecThread * _thread, ILString * 
_p1);

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** int_table.c 13 Aug 2003 02:14:22 -0000      1.78
--- int_table.c 19 Aug 2003 05:09:14 -0000      1.79
***************
*** 2224,2228 ****
        IL_METHOD("GetSystemDirectory", "()oSystem.String;", 
_IL_DirMethods_GetSystemDirectory, marshal_pp)
        IL_METHOD("GetLogicalDrives", "()[oSystem.String;", 
_IL_DirMethods_GetLogicalDrives, marshal_pp)
-       IL_METHOD("GetCurrentDirectory", "()oSystem.String;", 
_IL_DirMethods_GetCurrentDirectory, marshal_pp)
        IL_METHOD("GetPathInfo", "()vPlatform.PathInfo;", 
_IL_DirMethods_GetPathInfo, marshal_vpp)
        IL_METHOD("Delete", "(oSystem.String;)vPlatform.Errno;", 
_IL_DirMethods_Delete, marshal_ipp)
--- 2224,2227 ----
***************
*** 2231,2234 ****
--- 2230,2234 ----
        IL_METHOD("GetLastModification", "(oSystem.String;&l)vPlatform.Errno;", 
_IL_DirMethods_GetLastModification, marshal_ippp)
        IL_METHOD("GetFilesInDirectory", 
"(oSystem.String;&[vPlatform.InternalFileInfo;)vPlatform.Errno;", 
_IL_DirMethods_GetFilesInDirectory, marshal_ippp)
+       IL_METHOD("GetCurrentDirectory", "()oSystem.String;", 
_IL_DirMethods_GetCurrentDirectory, marshal_pp)
        IL_METHOD("ChangeDirectory", "(oSystem.String;)vPlatform.Errno;", 
_IL_DirMethods_ChangeDirectory, marshal_ipp)
        IL_METHOD("Rename", "(oSystem.String;oSystem.String;)vPlatform.Errno;", 
_IL_DirMethods_Rename, marshal_ippp)
***************
*** 2411,2414 ****
--- 2411,2423 ----
  #if !defined(HAVE_LIBFFI)
  
+ static void marshal_bpjll(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, ILInt64, 
ILInt64))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])), 
*((ILInt64 *)(avalue[2])), *((ILInt64 *)(avalue[3])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
  static void marshal_jp(void (*fn)(), void *rvalue, void **avalue)
  {
***************
*** 2442,2445 ****
--- 2451,2456 ----
        IL_METHOD("Read", "(j[Bii)i", _IL_FileMethods_Read, marshal_ipjpii)
        IL_METHOD("SetLength", "(jl)Z", _IL_FileMethods_SetLength, marshal_bpjl)
+       IL_METHOD("Lock", "(jll)Z", _IL_FileMethods_Lock, marshal_bpjll)
+       IL_METHOD("Unlock", "(jll)Z", _IL_FileMethods_Unlock, marshal_bpjll)
        IL_METHOD("GetInvalidHandle", "()j", _IL_FileMethods_GetInvalidHandle, 
marshal_jp)
        IL_METHOD("GetFileType", "(oSystem.String;)vPlatform.FileType;", 
_IL_FileMethods_GetFileType, marshal_ipp)

Index: lib_file.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** lib_file.c  27 Jun 2003 00:18:26 -0000      1.10
--- lib_file.c  19 Aug 2003 05:09:14 -0000      1.11
***************
*** 197,200 ****
--- 197,218 ----
  
  /*
+  * public static bool Lock(IntPtr handle, long position, long length);
+  */
+ ILBool _IL_FileMethods_Lock(ILExecThread *_thread, ILNativeInt handle,
+                                                       ILInt64 position, 
ILInt64 length)
+ {
+       return (ILBool)(ILSysIOLock((ILSysIOHandle)handle, position, length));
+ }
+ 
+ /*
+  * public static bool Unlock(IntPtr handle, long position, long length);
+  */
+ ILBool _IL_FileMethods_Unlock(ILExecThread *_thread, ILNativeInt handle,
+                                                         ILInt64 position, 
ILInt64 length)
+ {
+       return (ILBool)(ILSysIOUnlock((ILSysIOHandle)handle, position, length));
+ }
+ 
+ /*
   * public static Errno GetErrno();
   */