Skip to content

Commit 9f56b14

Browse files
committed
Remove unneeded const fn workarounds
1 parent b0936c3 commit 9f56b14

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

src/ntldr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ pub const fn LDR_IS_IMAGEMAPPING(DllHandle: ULONG_PTR) -> bool {
201201
}
202202
#[inline]
203203
pub const fn LDR_IS_RESOURCE(DllHandle: ULONG_PTR) -> bool {
204-
(LDR_IS_IMAGEMAPPING(DllHandle) | LDR_IS_DATAFILE(DllHandle)) as u8 != 0 //fixme
204+
LDR_IS_IMAGEMAPPING(DllHandle) || LDR_IS_DATAFILE(DllHandle)
205205
}
206206
EXTERN!{extern "system" {
207207
fn LdrLoadDll(

src/ntpsapi.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,14 +1121,22 @@ ENUM!{enum PS_ATTRIBUTE_NUM {
11211121
}}
11221122
#[inline]
11231123
pub const fn PsAttributeValue(
1124-
Number: PS_ATTRIBUTE_NUM,
1124+
mut Number: PS_ATTRIBUTE_NUM,
11251125
Thread: bool,
11261126
Input: bool,
11271127
Additive: bool,
1128-
) -> ULONG_PTR { //fixme
1129-
(Number & PS_ATTRIBUTE_NUMBER_MASK | [0, PS_ATTRIBUTE_THREAD][Thread as usize]
1130-
| [0, PS_ATTRIBUTE_INPUT][Input as usize] | [0, PS_ATTRIBUTE_ADDITIVE][Additive as usize]
1131-
) as usize
1128+
) -> ULONG_PTR {
1129+
Number &= PS_ATTRIBUTE_NUMBER_MASK;
1130+
if Thread {
1131+
Number |= PS_ATTRIBUTE_THREAD;
1132+
}
1133+
if Input {
1134+
Number |= PS_ATTRIBUTE_INPUT;
1135+
}
1136+
if Additive {
1137+
Number |= PS_ATTRIBUTE_ADDITIVE;
1138+
}
1139+
Number as _
11321140
}
11331141
pub const PS_ATTRIBUTE_PARENT_PROCESS: ULONG_PTR = 0x00060000;
11341142
pub const PS_ATTRIBUTE_DEBUG_PORT: ULONG_PTR = 0x00060001;

src/ntrtl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2506,7 +2506,7 @@ EXTERN!{extern "system" {
25062506
}}
25072507
#[inline]
25082508
pub const fn RtlIsEqualLuid(L1: &LUID, L2: &LUID) -> bool {
2509-
((L1.LowPart == L2.LowPart) & (L1.HighPart == L2.HighPart)) as u8 != 0 //fixme
2509+
(L1.LowPart == L2.LowPart) && (L1.HighPart == L2.HighPart)
25102510
}
25112511
#[inline]
25122512
pub const fn RtlIsZeroLuid(L1: &LUID) -> bool {

0 commit comments

Comments
 (0)