[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnet/engine convert.c,1.18,1.19
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnet/engine convert.c,1.18,1.19 |
Date: |
Mon, 28 Jul 2003 03:58:31 -0400 |
Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv31458/engine
Modified Files:
convert.c
Log Message:
Use DllNotFoundException and EntryPointNotFoundException instead
of MissingMethodException during PInvoke operations.
Index: convert.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/convert.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** convert.c 5 Jul 2003 12:20:09 -0000 1.18
--- convert.c 28 Jul 2003 07:58:25 -0000 1.19
***************
*** 31,38 ****
#define IL_CONVERT_OK 0
#define IL_CONVERT_VERIFY_FAILED 1
! #define IL_CONVERT_MISSING_METHOD 2
#define IL_CONVERT_NOT_IMPLEMENTED 3
#define IL_CONVERT_OUT_OF_MEMORY 4
#define IL_CONVERT_TYPE_INIT 5
#ifdef IL_CONFIG_PINVOKE
--- 31,39 ----
#define IL_CONVERT_OK 0
#define IL_CONVERT_VERIFY_FAILED 1
! #define IL_CONVERT_ENTRY_POINT 2
#define IL_CONVERT_NOT_IMPLEMENTED 3
#define IL_CONVERT_OUT_OF_MEMORY 4
#define IL_CONVERT_TYPE_INIT 5
+ #define IL_CONVERT_DLL_NOT_FOUND 6
#ifdef IL_CONFIG_PINVOKE
***************
*** 198,202 ****
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_MISSING_METHOD;
return 0;
}
--- 199,203 ----
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_ENTRY_POINT;
return 0;
}
***************
*** 208,212 ****
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_MISSING_METHOD;
return 0;
}
--- 209,213 ----
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_ENTRY_POINT;
return 0;
}
***************
*** 215,219 ****
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_MISSING_METHOD;
return 0;
}
--- 216,220 ----
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_ENTRY_POINT;
return 0;
}
***************
*** 223,227 ****
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_MISSING_METHOD;
return 0;
}
--- 224,228 ----
{
METADATA_UNLOCK(thread);
! *errorCode = IL_CONVERT_DLL_NOT_FOUND;
return 0;
}
***************
*** 300,304 ****
METADATA_UNLOCK(thread);
if(pinv)
! *errorCode = IL_CONVERT_MISSING_METHOD;
else
*errorCode = IL_CONVERT_NOT_IMPLEMENTED;
--- 301,305 ----
METADATA_UNLOCK(thread);
if(pinv)
! *errorCode = IL_CONVERT_ENTRY_POINT;
else
*errorCode = IL_CONVERT_NOT_IMPLEMENTED;
***************
*** 434,442 ****
break;
! case IL_CONVERT_MISSING_METHOD:
{
ILExecThreadSetException
(thread, _ILSystemException(thread,
!
"System.MissingMethodException"));
}
break;
--- 435,443 ----
break;
! case IL_CONVERT_ENTRY_POINT:
{
ILExecThreadSetException
(thread, _ILSystemException(thread,
!
"System.EntryPointNotFoundException"));
}
break;
***************
*** 461,464 ****
--- 462,473 ----
(thread, _ILSystemException(thread,
"System.TypeInitializationException"));
+ }
+ break;
+
+ case IL_CONVERT_DLL_NOT_FOUND:
+ {
+ ILExecThreadSetException
+ (thread, _ILSystemException(thread,
+ "System.DllNotFoundException"));
}
break;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnet/engine convert.c,1.18,1.19,
Rhys Weatherley <address@hidden> <=