This commit is contained in:
DavidXanatos 2024-11-13 12:00:55 +01:00
parent 2d4dc4d331
commit 4523b54004
6 changed files with 20 additions and 5 deletions

View File

@ -12,6 +12,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- fixed issue with DLL unloading - fixed issue with DLL unloading
- fixed Files Resource Access - Browse for Folder - allows access to excluded folders [#4007](https://github.com/sandboxie-plus/Sandboxie/issues/4007) - fixed Files Resource Access - Browse for Folder - allows access to excluded folders [#4007](https://github.com/sandboxie-plus/Sandboxie/issues/4007)
### Changed
- validated compatibility with Windows build 27744 and updated DynData
## [1.15.1 / 5.70.1] - 2024-10-29 ## [1.15.1 / 5.70.1] - 2024-10-29

View File

@ -158,7 +158,7 @@ BOOL CAboutDialog::OnInitDialog()
GetDlgItem(ID_ABOUT_COPYRIGHT)->SetWindowText(text); GetDlgItem(ID_ABOUT_COPYRIGHT)->SetWindowText(text);
SCertInfo CertInfo = { 0 }; SCertInfo CertInfo = { 0 };
SbieApi_Call(API_QUERY_DRIVER_INFO, 3, -1, (ULONG_PTR)&CertInfo, sizeof(CertInfo)); SbieApi_QueryDrvInfo(-1, &CertInfo, sizeof(CertInfo));
if (CertInfo.active) if (CertInfo.active)
GetDlgItem(ID_ABOUT_INFO)->SetWindowText(CMyMsg(MSG_7988)); GetDlgItem(ID_ABOUT_INFO)->SetWindowText(CMyMsg(MSG_7988));
else if (CertInfo.expired) // expired && !active -> outdated else if (CertInfo.expired) // expired && !active -> outdated

View File

@ -285,7 +285,7 @@ bool DoAboutDialog(bool bReminder)
if (g_bReminder) { if (g_bReminder) {
SCertInfo CertInfo = { 0 }; SCertInfo CertInfo = { 0 };
SbieApi_Call(API_QUERY_DRIVER_INFO, 3, -1, (ULONG_PTR)&CertInfo, sizeof(CertInfo)); SbieApi_QueryDrvInfo(-1, &CertInfo, sizeof(CertInfo));
if (CertInfo.active) if (CertInfo.active)
return true; return true;

View File

@ -445,6 +445,8 @@ BOOL Parse_Command_Line(void)
ULONG len = ULONG(tmp - cmd) * sizeof(WCHAR); ULONG len = ULONG(tmp - cmd) * sizeof(WCHAR);
memcpy((WCHAR*)&buffer[req.length], cmd, len); memcpy((WCHAR*)&buffer[req.length], cmd, len);
req.length += len; req.length += len;
*((WCHAR*)&buffer[req.length]) = 0;
req.length += sizeof(WCHAR);
} }
rpl = SbieDll_CallServer(&req); rpl = SbieDll_CallServer(&req);

View File

@ -741,6 +741,7 @@ _FX void File_InitLinks(THREAD_DATA *TlsData)
WCHAR save_char; WCHAR save_char;
FILE_GUID* guid; FILE_GUID* guid;
ULONG alloc_len; ULONG alloc_len;
WCHAR text[256];
// //
// cleanup old guid entries // cleanup old guid entries
@ -810,8 +811,7 @@ _FX void File_InitLinks(THREAD_DATA *TlsData)
ULONG VolumeNameLen = ULONG VolumeNameLen =
MountPoint->SymbolicLinkNameLength / sizeof(WCHAR); MountPoint->SymbolicLinkNameLength / sizeof(WCHAR);
WCHAR text[256]; Sbie_snwprintf(text, 256, L"Found Mountpoint: %.*s <-> %.*s", VolumeNameLen, VolumeName, DeviceNameLen, DeviceName);
Sbie_snwprintf(text, 256, L"Found mountpoint: %.*s <-> %.*s", VolumeNameLen, VolumeName, DeviceNameLen, DeviceName);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE); SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
if (VolumeNameLen != 48 && VolumeNameLen != 49) if (VolumeNameLen != 48 && VolumeNameLen != 49)
@ -875,6 +875,8 @@ _FX void File_InitLinks(THREAD_DATA *TlsData)
DosPath += DosPathLen + 1; DosPath += DosPathLen + 1;
while (*DosPath) { while (*DosPath) {
Sbie_snwprintf(text, 256, L"Mountpoint AddLink: %s <-> %s", DosPath, DeviceName);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
File_AddLink(TRUE, DosPath, DeviceName); File_AddLink(TRUE, DosPath, DeviceName);
DosPath += wcslen(DosPath) + 1; DosPath += wcslen(DosPath) + 1;
} }
@ -891,9 +893,13 @@ _FX void File_InitLinks(THREAD_DATA *TlsData)
// //
WCHAR *FirstDosPath = DosPath; WCHAR *FirstDosPath = DosPath;
Sbie_snwprintf(text, 256, L"Mountpoint AddLink: %s <-> %s", FirstDosPath, DeviceName);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
File_AddLink(TRUE, FirstDosPath, DeviceName); File_AddLink(TRUE, FirstDosPath, DeviceName);
DosPath += DosPathLen + 1; DosPath += DosPathLen + 1;
while (*DosPath) { while (*DosPath) {
Sbie_snwprintf(text, 256, L"Mountpoint AddLink: %s <-> %s", DosPath, DeviceName);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
File_AddLink(TRUE, DosPath, DeviceName); File_AddLink(TRUE, DosPath, DeviceName);
DosPath += wcslen(DosPath) + 1; DosPath += wcslen(DosPath) + 1;
} }
@ -916,9 +922,13 @@ _FX void File_InitLinks(THREAD_DATA *TlsData)
// //
WCHAR *FirstDosPath = DosPath; WCHAR *FirstDosPath = DosPath;
Sbie_snwprintf(text, 256, L"Mountpoint AddLink: %s <-> %s", DeviceName, FirstDosPath);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
File_AddLink(TRUE, DeviceName, FirstDosPath); File_AddLink(TRUE, DeviceName, FirstDosPath);
DosPath += DosPathLen + 1; DosPath += DosPathLen + 1;
while (*DosPath) { while (*DosPath) {
Sbie_snwprintf(text, 256, L"Mountpoint AddLink: %s <-> %s", DosPath, FirstDosPath);
SbieApi_MonitorPut2(MONITOR_DRIVE | MONITOR_TRACE, text, FALSE);
File_AddLink(TRUE, DosPath, FirstDosPath); File_AddLink(TRUE, DosPath, FirstDosPath);
DosPath += wcslen(DosPath) + 1; DosPath += wcslen(DosPath) + 1;
} }

View File

@ -34,7 +34,7 @@ const wchar_t Parameters[] = L"\\Parameters";
#define IMAGE_FILE_MACHINE_ARM64 0xAA64 // ARM64 Little-Endian #define IMAGE_FILE_MACHINE_ARM64 0xAA64 // ARM64 Little-Endian
#endif #endif
#define WIN11_LATEST 27729 // <----- #define WIN11_LATEST 27744 // <-----
#define SVR2025 26040 #define SVR2025 26040
#define WIN11_FIRST 22000 #define WIN11_FIRST 22000
#define SVR2022 20348 #define SVR2022 20348