sal/osl/w32/file_dirvol.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
New commits: commit 51f7a76441e6d80c4457ef2e0492999a27a3d74b Author: Xisco Fauli <[email protected]> AuthorDate: Thu Feb 19 16:27:33 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Feb 20 09:52:51 2026 +0100 tdf#170297: Revert "tdf#150118: fix call to AccessCheck" (26.2 only) This reverts commit 1a4f72f03b1bd49d486e52135e78971242fae649. Change-Id: I142da287cb3765cc7c6d845aefff45218104e0f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199763 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 748a431dd4f9..d2a87fbaac21 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -1549,12 +1549,10 @@ oslFileError SAL_CALL osl_getFileStatus( = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS }; DWORD grantedAccess = 0; BOOL accessStatus = TRUE; - PRIVILEGE_SET privSet; - DWORD privSetSize = sizeof(privSet); // https://learn.microsoft.com/en-us/windows/win32/api/securitybaseapi/nf-securitybaseapi-accesscheck BOOL bResult = AccessCheck(pSD, hImpersonationToken, FILE_GENERIC_WRITE, &mapping, - &privSet, &privSetSize, &grantedAccess, &accessStatus); + nullptr, nullptr, &grantedAccess, &accessStatus); if (bResult) { @@ -1566,13 +1564,13 @@ oslFileError SAL_CALL osl_getFileStatus( } else { - SAL_WARN("sal.osl", "AccessCheck API failed with: " << GetLastError()); + SAL_WARN("AccessCheck API failed with: ", oslTranslateFileError(GetLastError())); } LocalFree(pSD); // free memory } else { - SAL_WARN("sal.osl", "GetNamedSecurityInfoW API failed with: " << aResult); + SAL_WARN("GetNamedSecurityInfoW API failed with: ", aResult); } CloseHandle(hImpersonationToken); // free memory CloseHandle(hProcessToken); // free memory
