timamsk/WPinternals
1
0
Fork 0
mirror of https://github.com/ReneLergner/WPinternals.git synced 2026-06-18 21:30:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue regarding ACLs and Sahara handling

Browse Source
This commit is contained in:
Gustave Monce
2019-12-24 08:36:20 +01:00
parent a57896c429
commit b8d63d1a11
7 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Models/NativeMethods.cs
-2
View File
@@ -267,10 +267,8 @@ namespace WPinternals
public static extern bool DeviceIoControl(
IntPtr hDevice,
uint IoControlCode,
[MarshalAs(UnmanagedType.AsAny)]
[In] object InBuffer,
uint nInBufferSize,
[MarshalAs(UnmanagedType.AsAny)]
[Out] object OutBuffer,
uint nOutBufferSize,
ref uint pBytesReturned,
Models/PatchEngine.cs
+10 -4
View File
@@ -413,6 +413,8 @@ namespace WPinternals
{
if (FilePath.Contains(':'))
{
FileInfo fileInfo = new FileInfo(FilePath);
// Enable Take Ownership AND Restore ownership to original owner
// Take Ownership Privilge is not enough.
// We need Restore Privilege.
@@ -427,17 +429,18 @@ namespace WPinternals
}
// Backup original owner and ACL
OriginalACL = new FileSecurity(FilePath, AccessControlSections.Owner | AccessControlSections.Group | AccessControlSections.Access);
OriginalACL = fileInfo.GetAccessControl();
// And take the original security to create new security rules.
FileSecurity NewACL = new FileSecurity(FilePath, AccessControlSections.Owner | AccessControlSections.Group | AccessControlSections.Access);
FileSecurity NewACL = fileInfo.GetAccessControl();
// Take ownership
NewACL.SetOwner(WindowsIdentity.GetCurrent().User);
fileInfo.SetAccessControl(NewACL);
// And create a new access rule
NewACL.SetAccessRule(new FileSystemAccessRule(WindowsIdentity.GetCurrent().User, FileSystemRights.FullControl, AccessControlType.Allow));
fileInfo.SetAccessControl(NewACL);
// Open the file for patching
Stream = new FileStream(FilePath, FileMode.Open, FileAccess.ReadWrite);
@@ -457,10 +460,13 @@ namespace WPinternals
if (FilePath.Contains(':'))
{
FileInfo fileInfo = new FileInfo(FilePath);
// Restore original owner and access rules.
// The OriginalACL cannot be reused directly.
FileSecurity NewACL = new FileSecurity(FilePath, AccessControlSections.Owner | AccessControlSections.Group | AccessControlSections.Access);
FileSecurity NewACL = fileInfo.GetAccessControl();
NewACL.SetSecurityDescriptorBinaryForm(OriginalACL.GetSecurityDescriptorBinaryForm());
fileInfo.SetAccessControl(NewACL);
// Revert to self
RestorePrivilege.Revert();
Models/QualcommSahara.cs
+1 -1
View File
@@ -320,7 +320,7 @@ namespace WPinternals
{
LogFile.Log("Problem while starting programmer. Attempting again.", LogType.FileAndConsole);
}
} while (!Started || count >= 3);
} while (!Started || count < 3);
if (count >= 3 && !Started)
{
LogFile.Log("Maximum number of attempts to start the programmer exceeded.", LogType.FileAndConsole);