projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5714 from alexischr/update_bockbuild
[mono.git]
/
mono
/
metadata
/
mono-security-windows.c
diff --git
a/mono/metadata/mono-security-windows.c
b/mono/metadata/mono-security-windows.c
index d6f269c6e946b25b5f9968512832f726981882b6..bfdc96a9bb2804621bd149e99b7d36cd3967ee72 100644
(file)
--- a/
mono/metadata/mono-security-windows.c
+++ b/
mono/metadata/mono-security-windows.c
@@
-69,7
+69,7
@@
GetSidName (gunichar2 *server, PSID sid, gint32 *size)
}
gpointer
}
gpointer
-
ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentT
oken (void)
+
mono_security_principal_windows_identity_get_current_t
oken (void)
{
gpointer token = NULL;
{
gpointer token = NULL;
@@
-86,6
+86,13
@@
ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentToken (void)
return token;
}
return token;
}
+gpointer
+ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentToken (MonoError *error)
+{
+ error_init (error);
+ return mono_security_principal_windows_identity_get_current_token ();
+}
+
gint32
mono_security_win_get_token_name (gpointer token, gunichar2 ** uniname)
{
gint32
mono_security_win_get_token_name (gpointer token, gunichar2 ** uniname)
{
@@
-104,34
+111,33
@@
mono_security_win_get_token_name (gpointer token, gunichar2 ** uniname)
}
#endif /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */
}
#endif /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */
-MonoString
*
-ves_icall_System_Security_Principal_WindowsIdentity_GetTokenName (gpointer token)
+MonoString
Handle
+ves_icall_System_Security_Principal_WindowsIdentity_GetTokenName (gpointer token
, MonoError *error
)
{
{
- MonoError error;
- MonoString *result = NULL;
+ MonoStringHandle result;
gunichar2 *uniname = NULL;
gint32 size = 0;
gunichar2 *uniname = NULL;
gint32 size = 0;
- error_init (
&
error);
+ error_init (error);
size = mono_security_win_get_token_name (token, &uniname);
if (size > 0) {
size = mono_security_win_get_token_name (token, &uniname);
if (size > 0) {
- result = mono_string_new_utf16_
checked (mono_domain_get (), uniname, size, &
error);
+ result = mono_string_new_utf16_
handle (mono_domain_get (), uniname, size,
error);
}
else
}
else
- result = mono_string_new
(mono_domain_get (), ""
);
+ result = mono_string_new
_handle (mono_domain_get (), "", error
);
if (uniname)
g_free (uniname);
if (uniname)
g_free (uniname);
- mono_error_set_pending_exception (&error);
return result;
}
gpointer
return result;
}
gpointer
-ves_icall_System_Security_Principal_WindowsIdentity_GetUserToken (MonoString
*username
)
+ves_icall_System_Security_Principal_WindowsIdentity_GetUserToken (MonoString
Handle username, MonoError *error
)
{
{
+ error_init (error);
gpointer token = NULL;
/* TODO: MS has something like this working in Windows 2003 (client and
gpointer token = NULL;
/* TODO: MS has something like this working in Windows 2003 (client and
@@
-264,7
+270,7
@@
GetCurrentUserSid (void)
{
PSID sid = NULL;
guint32 size = 0;
{
PSID sid = NULL;
guint32 size = 0;
- gpointer token =
ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentT
oken ();
+ gpointer token =
mono_security_principal_windows_identity_get_current_t
oken ();
GetTokenInformation (token, TokenUser, NULL, size, (PDWORD)&size);
if (size > 0) {
GetTokenInformation (token, TokenUser, NULL, size, (PDWORD)&size);
if (size > 0) {