[Dotgnu-pnet-commits] CVS: pnet/engine engine.h, 1.83, 1.84 int_proto.h, 1.76, 1.77 int_table.c, 1.79, 1.80 lib_security.c, 1.2, 1.3 thread.c, 1.22, 1.23

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        engine.h int_proto.h int_table.c lib_security.c thread.c 
Log Message:


Remove the obsolete platform security manager classes, which will be
superceded by CAS.


Index: engine.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/engine.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** engine.h    15 Jul 2003 22:17:33 -0000      1.83
--- engine.h    19 Aug 2003 05:56:59 -0000      1.84
***************
*** 252,258 ****
        int                             aborting;
  
-       /* Security manager in use by this thread */
-       ILObject           *securityManager;
- 
        /* System.Threading.Thread object */
        ILObject *clrThread;
--- 252,255 ----

Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** int_proto.h 19 Aug 2003 05:09:13 -0000      1.76
--- int_proto.h 19 Aug 2003 05:56:59 -0000      1.77
***************
*** 532,541 ****
  extern ILInt32 _IL_FileMethods_Copy(ILExecThread * _thread, ILString * _p1, 
ILString * _p2);
  
- extern ILBool _IL_RuntimeSecurityManager_CanUseFileHandle(ILExecThread * 
_thread, ILObject * _this, ILNativeInt _p1);
- extern ILBool _IL_RuntimeSecurityManager_CanOpenFile(ILExecThread * _thread, 
ILObject * _this, ILString * _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4);
- 
- extern ILObject * _IL_Security_GetSecurityManager(ILExecThread * _thread);
- extern void _IL_Security_SetSecurityManager(ILExecThread * _thread, ILObject 
* _p1);
- 
  extern ILInt32 _IL_InfoMethods_GetPlatformID(ILExecThread * _thread);
  extern ILString * _IL_InfoMethods_GetRuntimeVersion(ILExecThread * _thread);
--- 532,535 ----

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** int_table.c 19 Aug 2003 05:09:14 -0000      1.79
--- int_table.c 19 Aug 2003 05:56:59 -0000      1.80
***************
*** 2467,2497 ****
  #endif
  
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_bpppiii(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, void *, void *, 
ILInt32, ILInt32, ILInt32))fn)(*((void * *)(avalue[0])), *((void * 
*)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 
*)(avalue[4])), *((ILInt32 *)(avalue[5])));
- }
- 
- #endif
- 
- #ifndef _IL_RuntimeSecurityManager_suppressed
- 
- IL_METHOD_BEGIN(RuntimeSecurityManager_Methods)
-       IL_METHOD("CanUseFileHandle", "(Tj)Z", 
_IL_RuntimeSecurityManager_CanUseFileHandle, marshal_bppj)
-       IL_METHOD("CanOpenFile", 
"(ToSystem.String;vSystem.IO.FileMode;vSystem.IO.FileAccess;vSystem.IO.FileShare;)Z",
 _IL_RuntimeSecurityManager_CanOpenFile, marshal_bpppiii)
- IL_METHOD_END
- 
- #endif
- 
- #ifndef _IL_Security_suppressed
- 
- IL_METHOD_BEGIN(Security_Methods)
-       IL_METHOD("GetSecurityManager", "()oPlatform.ISecurityManager;", 
_IL_Security_GetSecurityManager, marshal_pp)
-       IL_METHOD("SetSecurityManager", "(oPlatform.ISecurityManager;)V", 
_IL_Security_SetSecurityManager, marshal_vpp)
- IL_METHOD_END
- 
- #endif
- 
  #ifndef _IL_InfoMethods_suppressed
  
--- 2467,2470 ----
***************
*** 3002,3011 ****
  #ifndef _IL_RuntimeMethodHandle_suppressed
        {"RuntimeMethodHandle", "System", RuntimeMethodHandle_Methods},
- #endif
- #ifndef _IL_RuntimeSecurityManager_suppressed
-       {"RuntimeSecurityManager", "Platform", RuntimeSecurityManager_Methods},
- #endif
- #ifndef _IL_Security_suppressed
-       {"Security", "Platform", Security_Methods},
  #endif
  #ifndef _IL_SignatureHelper_suppressed
--- 2975,2978 ----

Index: lib_security.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_security.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lib_security.c      31 Mar 2003 05:49:34 -0000      1.2
--- lib_security.c      19 Aug 2003 05:56:59 -0000      1.3
***************
*** 81,132 ****
  }
  
- /*
-  * public bool CanUseFileHandle(IntPtr handle);
-  */
- ILBool _IL_RuntimeSecurityManager_CanUseFileHandle(ILExecThread *_thread,
-                                                                               
                   ILObject *_this,
-                                                                               
                   ILNativeInt handle)
- {
-       /* TODO */
-       return 0;
- }
- 
- /*
-  * public bool CanOpenFile(String path, FileMode mode,
-  *                                               FileAccess access, FileShare 
share);
-  */
- ILBool _IL_RuntimeSecurityManager_CanOpenFile(ILExecThread *_thread,
-                                                                               
          ILObject *_this,
-                                                                               
          ILString * path,
-                                                                               
          ILInt32 mode, ILInt32 access,
-                                                                               
          ILInt32 share)
- {
-       /* TODO */
-       return 1;
- }
- 
- /*
-  * private static ISecurityManager GetSecurityManager();
-  */
- ILObject *_IL_Security_GetSecurityManager(ILExecThread *_thread)
- {
-       ILObject *mgr = _thread->securityManager;
-       if(!mgr)
-       {
-               mgr = ILExecThreadNew(_thread, 
"Platform.RuntimeSecurityManager",
-                                                         "(T)V");
-               _thread->securityManager = mgr;
-       }
-       return mgr;
- }
- 
- /*
-  * private static void SetSecurityManager(ISecurityManager mgr);
-  */
- void _IL_Security_SetSecurityManager(ILExecThread *_thread, ILObject *mgr)
- {
-       _thread->securityManager = mgr;
- }
- 
  #ifdef        __cplusplus
  };
--- 81,84 ----

Index: thread.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/thread.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** thread.c    15 Jul 2003 22:17:33 -0000      1.22
--- thread.c    19 Aug 2003 05:56:59 -0000      1.23
***************
*** 185,189 ****
        thread->method = 0;
        thread->thrownException = 0;    
-       thread->securityManager = 0;
        thread->threadStaticSlots = 0;
        thread->threadStaticSlotsUsed = 0;
--- 185,188 ----