mirror of
https://github.com/yamakadi/clroxide
synced 2026-06-08 18:28:14 +00:00
fix cargo warnings
This commit is contained in:
+2
-2
@@ -1,6 +1,6 @@
|
||||
use crate::primitives::{
|
||||
ICLRMetaHost, ICLRRuntimeInfo, ICorRuntimeHost, IUnknown, Interface, _AppDomain,
|
||||
_MethodInfo, _StringWriter, wrap_method_arguments, GUID, HRESULT,
|
||||
ICLRMetaHost, ICLRRuntimeInfo, ICorRuntimeHost, IUnknown, Interface, _AppDomain, _MethodInfo,
|
||||
_StringWriter, wrap_method_arguments, GUID, HRESULT,
|
||||
};
|
||||
use std::{ffi::c_void, ptr};
|
||||
use windows::Win32::System::Com::VARIANT;
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
#[allow(non_snake_case)]
|
||||
pub mod clr;
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub mod primitives;
|
||||
|
||||
@@ -7,7 +7,8 @@ use windows::{
|
||||
VT_ARRAY, VT_BSTR, VT_UI1, VT_VARIANT,
|
||||
},
|
||||
Ole::{
|
||||
SafeArrayAccessData, SafeArrayCreate, SafeArrayCreateVector, SafeArrayGetUBound, SafeArrayPutElement, SafeArrayUnaccessData,
|
||||
SafeArrayAccessData, SafeArrayCreate, SafeArrayCreateVector, SafeArrayGetUBound,
|
||||
SafeArrayPutElement, SafeArrayUnaccessData,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::primitives::{
|
||||
itype::_Type, IUnknown, IUnknownVtbl, Interface, _MethodInfo,
|
||||
wrap_method_arguments, wrap_strings_in_array, GUID, HRESULT,
|
||||
itype::_Type, IUnknown, IUnknownVtbl, Interface, _MethodInfo, wrap_method_arguments,
|
||||
wrap_strings_in_array, GUID, HRESULT,
|
||||
};
|
||||
use std::{
|
||||
ffi::{c_long, c_void},
|
||||
@@ -89,7 +89,7 @@ pub struct _AssemblyVtbl {
|
||||
|
||||
impl _Assembly {
|
||||
pub fn run_entrypoint(&self, args: &[String]) -> Result<VARIANT, String> {
|
||||
let entrypoint = unsafe { (*self).get_entrypoint()? };
|
||||
let entrypoint = (*self).get_entrypoint()?;
|
||||
let signature = unsafe { (*entrypoint).to_string()? };
|
||||
|
||||
if signature.ends_with("Main()") {
|
||||
|
||||
@@ -36,13 +36,11 @@ impl ICLRMetaHost {
|
||||
pub fn new(clr_create_instance: CLRCreateInstance) -> Result<*mut ICLRMetaHost, String> {
|
||||
let mut ppv: *mut ICLRMetaHost = ptr::null_mut();
|
||||
|
||||
let hr = unsafe {
|
||||
clr_create_instance(
|
||||
&ICLRMetaHost::CLSID,
|
||||
&ICLRMetaHost::IID,
|
||||
&mut ppv as *mut *mut _ as *mut *mut c_void,
|
||||
)
|
||||
};
|
||||
let hr = clr_create_instance(
|
||||
&ICLRMetaHost::CLSID,
|
||||
&ICLRMetaHost::IID,
|
||||
&mut ppv as *mut *mut _ as *mut *mut c_void,
|
||||
);
|
||||
|
||||
if hr.is_err() {
|
||||
return Err(format!("{:?}", hr));
|
||||
|
||||
@@ -9,7 +9,7 @@ use windows::{
|
||||
core::BSTR,
|
||||
Win32::System::{
|
||||
Com::{SAFEARRAY, VARIANT, VT_UNKNOWN},
|
||||
Ole::{SafeArrayCreateVector},
|
||||
Ole::SafeArrayCreateVector,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -75,7 +75,7 @@ impl _MethodInfo {
|
||||
instance: Option<VARIANT>,
|
||||
) -> Result<VARIANT, String> {
|
||||
let args_len = get_array_length(args);
|
||||
let parameter_count = unsafe { (*self).get_parameter_count()? };
|
||||
let parameter_count = (*self).get_parameter_count()?;
|
||||
|
||||
if args_len != parameter_count {
|
||||
return Err(format!(
|
||||
@@ -103,7 +103,7 @@ impl _MethodInfo {
|
||||
pub fn invoke_without_args(&self, instance: Option<VARIANT>) -> Result<VARIANT, String> {
|
||||
let method_args = empty_array();
|
||||
|
||||
unsafe { (*self).invoke(method_args, instance) }
|
||||
(*self).invoke(method_args, instance)
|
||||
}
|
||||
|
||||
pub fn get_parameter_count(&self) -> Result<i32, String> {
|
||||
|
||||
+22
-22
@@ -269,7 +269,7 @@ impl _Type {
|
||||
self.invoke_member(
|
||||
instance.clone(),
|
||||
method,
|
||||
BindingFlags_Public | BindingFlags_Static | BindingFlags_InvokeMethod,
|
||||
BINDING_FLAGS_PUBLIC | BINDING_FLAGS_STATIC | BINDING_FLAGS_INVOKE_METHOD,
|
||||
args,
|
||||
)
|
||||
}
|
||||
@@ -283,7 +283,7 @@ impl _Type {
|
||||
self.invoke_member(
|
||||
instance.clone(),
|
||||
method,
|
||||
BindingFlags_Public | BindingFlags_InvokeMethod,
|
||||
BINDING_FLAGS_PUBLIC | BINDING_FLAGS_INVOKE_METHOD,
|
||||
args,
|
||||
)
|
||||
}
|
||||
@@ -465,23 +465,23 @@ impl Interface for _Type {
|
||||
}
|
||||
|
||||
pub type BindingFlags = u32;
|
||||
pub const BindingFlags_Default: BindingFlags = 0;
|
||||
pub const BindingFlags_IgnoreCase: BindingFlags = 1;
|
||||
pub const BindingFlags_DeclaredOnly: BindingFlags = 2;
|
||||
pub const BindingFlags_Instance: BindingFlags = 4;
|
||||
pub const BindingFlags_Static: BindingFlags = 8;
|
||||
pub const BindingFlags_Public: BindingFlags = 16;
|
||||
pub const BindingFlags_NonPublic: BindingFlags = 32;
|
||||
pub const BindingFlags_FlattenHierarchy: BindingFlags = 64;
|
||||
pub const BindingFlags_InvokeMethod: BindingFlags = 256;
|
||||
pub const BindingFlags_CreateInstance: BindingFlags = 512;
|
||||
pub const BindingFlags_GetField: BindingFlags = 1024;
|
||||
pub const BindingFlags_SetField: BindingFlags = 2048;
|
||||
pub const BindingFlags_GetProperty: BindingFlags = 4096;
|
||||
pub const BindingFlags_SetProperty: BindingFlags = 8192;
|
||||
pub const BindingFlags_PutDispProperty: BindingFlags = 16384;
|
||||
pub const BindingFlags_PutRefDispProperty: BindingFlags = 32768;
|
||||
pub const BindingFlags_ExactBinding: BindingFlags = 65536;
|
||||
pub const BindingFlags_SuppressChangeType: BindingFlags = 131072;
|
||||
pub const BindingFlags_OptionalParamBinding: BindingFlags = 262144;
|
||||
pub const BindingFlags_IgnoreReturn: BindingFlags = 16777216;
|
||||
pub const BINDING_FLAGS_DEFAULT: BindingFlags = 0;
|
||||
pub const BINDING_FLAGS_IGNORE_CASE: BindingFlags = 1;
|
||||
pub const BINDING_FLAGS_DECLARED_ONLY: BindingFlags = 2;
|
||||
pub const BINDING_FLAGS_INSTANCE: BindingFlags = 4;
|
||||
pub const BINDING_FLAGS_STATIC: BindingFlags = 8;
|
||||
pub const BINDING_FLAGS_PUBLIC: BindingFlags = 16;
|
||||
pub const BINDING_FLAGS_NON_PUBLIC: BindingFlags = 32;
|
||||
pub const BINDING_FLAGS_FLATTEN_HIERARCHY: BindingFlags = 64;
|
||||
pub const BINDING_FLAGS_INVOKE_METHOD: BindingFlags = 256;
|
||||
pub const BINDING_FLAGS_CREATE_INSTANCE: BindingFlags = 512;
|
||||
pub const BINDING_FLAGS_GET_FIELD: BindingFlags = 1024;
|
||||
pub const BINDING_FLAGS_SET_FIELD: BindingFlags = 2048;
|
||||
pub const BINDING_FLAGS_GET_PROPERTY: BindingFlags = 4096;
|
||||
pub const BINDING_FLAGS_SET_PROPERTY: BindingFlags = 8192;
|
||||
pub const BINDING_FLAGS_PUT_DISP_PROPERTY: BindingFlags = 16384;
|
||||
pub const BINDING_FLAGS_PUT_REF_DISP_PROPERTY: BindingFlags = 32768;
|
||||
pub const BINDING_FLAGS_EXACT_BINDING: BindingFlags = 65536;
|
||||
pub const BINDING_FLAGS_SUPPRESS_CHANGE_TYPE: BindingFlags = 131072;
|
||||
pub const BINDING_FLAGS_OPTIONAL_PARAM_BINDING: BindingFlags = 262144;
|
||||
pub const BINDING_FLAGS_IGNORE_RETURN: BindingFlags = 16777216;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#[allow(non_snake_case)]
|
||||
mod helpers;
|
||||
mod iappdomain;
|
||||
mod iassembly;
|
||||
|
||||
Reference in New Issue
Block a user