admin/MSxDOS-ntapi
1
0
Fork 0
mirror of https://github.com/MSxDOS/ntapi synced 2026-06-08 11:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded const fn workarounds

Browse Source
This commit is contained in:
MSxDOS
2022-09-24 00:02:09 +03:00
parent b0936c3c7d
commit 9f56b149c9
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ntldr.rs
+1 -1
View File
@@ -201,7 +201,7 @@ pub const fn LDR_IS_IMAGEMAPPING(DllHandle: ULONG_PTR) -> bool {
}
#[inline]
pub const fn LDR_IS_RESOURCE(DllHandle: ULONG_PTR) -> bool {
(LDR_IS_IMAGEMAPPING(DllHandle) | LDR_IS_DATAFILE(DllHandle)) as u8 != 0 //fixme
LDR_IS_IMAGEMAPPING(DllHandle) || LDR_IS_DATAFILE(DllHandle)
}
EXTERN!{extern "system" {
fn LdrLoadDll(
src/ntpsapi.rs
+13 -5
View File
@@ -1121,14 +1121,22 @@ ENUM!{enum PS_ATTRIBUTE_NUM {
}}
#[inline]
pub const fn PsAttributeValue(
Number: PS_ATTRIBUTE_NUM,
mut Number: PS_ATTRIBUTE_NUM,
Thread: bool,
Input: bool,
Additive: bool,
) -> ULONG_PTR { //fixme
(Number & PS_ATTRIBUTE_NUMBER_MASK | [0, PS_ATTRIBUTE_THREAD][Thread as usize]
| [0, PS_ATTRIBUTE_INPUT][Input as usize] | [0, PS_ATTRIBUTE_ADDITIVE][Additive as usize]
) as usize
) -> ULONG_PTR {
Number &= PS_ATTRIBUTE_NUMBER_MASK;
if Thread {
Number |= PS_ATTRIBUTE_THREAD;
}
if Input {
Number |= PS_ATTRIBUTE_INPUT;
}
if Additive {
Number |= PS_ATTRIBUTE_ADDITIVE;
}
Number as _
}
pub const PS_ATTRIBUTE_PARENT_PROCESS: ULONG_PTR = 0x00060000;
pub const PS_ATTRIBUTE_DEBUG_PORT: ULONG_PTR = 0x00060001;
src/ntrtl.rs
+1 -1
View File
@@ -2506,7 +2506,7 @@ EXTERN!{extern "system" {
}}
#[inline]
pub const fn RtlIsEqualLuid(L1: &LUID, L2: &LUID) -> bool {
((L1.LowPart == L2.LowPart) & (L1.HighPart == L2.HighPart)) as u8 != 0 //fixme
(L1.LowPart == L2.LowPart) && (L1.HighPart == L2.HighPart)
}
#[inline]
pub const fn RtlIsZeroLuid(L1: &LUID) -> bool {