mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

1.12.0

This commit is contained in:
DavidXanatos 2023-10-19 18:42:39 +02:00
parent f12a9e002c
commit 838c86a8c8
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SandboxiePlus/QSbieAPI/SbieAPI.cpp
View File

@ -811,7 +811,7 @@ extern "C" {
NTSTATUS NTAPI RtlSetThreadErrorMode(IN ULONG NewMode, OUT PULONG OldMode);
}
ULONG CSbieAPI__GetVolumeSN(wchar_t* path)
quint32 CSbieAPI::GetVolumeSN(const wchar_t* path, std::wstring* pLabel)
{
ULONG sn = 0;
HANDLE handle;
@ -849,8 +849,10 @@ ULONG CSbieAPI__GetVolumeSN(wchar_t* path)
FILE_FS_VOLUME_INFORMATION volumeInfo;
BYTE volumeInfoBuff[64];
} u;
if (NT_SUCCESS(NtQueryVolumeInformationFile(handle, &iosb, &u.volumeInfo, sizeof(u), FileFsVolumeInformation)))
sn = u.volumeInfo.VolumeSerialNumber;
if (NT_SUCCESS(NtQueryVolumeInformationFile(handle, &iosb, &u.volumeInfo, sizeof(u), FileFsVolumeInformation))) {
sn = u.volumeInfo.VolumeSerialNumber;
if (pLabel) *pLabel = std::wstring(u.volumeInfo.VolumeLabel, u.volumeInfo.VolumeLabelLength/sizeof(wchar_t));
}
NtClose(handle);
}
@ -925,7 +927,7 @@ void CSbieAPI::UpdateDriveLetters()
}
else {
Drive.Type = SDrive::EVolume;
if (ULONG sn = CSbieAPI__GetVolumeSN(lpTargetPath))
if (quint32 sn = GetVolumeSN(lpTargetPath))
Drive.Aux = QString("%1-%2").arg((ushort)HIWORD(sn), 4, 16, QChar('0')).arg((ushort)LOWORD(sn), 4, 16, QChar('0')).toUpper();
}
Key.append("\\");
@ -2141,7 +2143,7 @@ SB_STATUS CSbieAPI::SetSecureParam(const QString& Name, const void* data, size_t
return SB_OK;
}
SB_STATUS CSbieAPI::GetSecureParam(const QString& Name, void* data, size_t size)
SB_STATUS CSbieAPI::GetSecureParam(const QString& Name, void* data, size_t size, quint32* size_out, bool bVerify)
{
__declspec(align(8)) ULONG64 parms[API_NUM_ARGS];
API_SECURE_PARAM_ARGS *args = (API_SECURE_PARAM_ARGS*)parms;
@ -2153,6 +2155,8 @@ SB_STATUS CSbieAPI::GetSecureParam(const QString& Name, void* data, size_t size)
args->param_name.val = (WCHAR*)name.c_str();
args->param_data.val = (void*)data;
args->param_size.val = size;
args->param_size_out.val = (ULONG*)size_out;
args->param_verify.val = bVerify;
NTSTATUS status = m->IoControl(parms);
if (!NT_SUCCESS(status))

3
SandboxiePlus/QSbieAPI/SbieAPI.h
View File

@ -57,6 +57,7 @@ public:
virtual void UpdateDriveLetters();
virtual QString Nt2DosPath(QString NtPath, bool* pOk = NULL) const;
static quint32 GetVolumeSN(const wchar_t* path, std::wstring* pLabel = NULL);
virtual SB_STATUS ReloadBoxes(bool bForceUpdate = false);
static SB_STATUS ValidateName(const QString& BoxName);
@ -155,7 +156,7 @@ public:
virtual quint32 GetSessionID() const;
virtual SB_STATUS SetSecureParam(const QString& Name, const void* data, size_t size);
virtual SB_STATUS GetSecureParam(const QString& Name, void* data, size_t size);
virtual SB_STATUS GetSecureParam(const QString& Name, void* data, size_t size, quint32* size_out = NULL, bool bVerify = false);
enum ESbieQueuedRequests