diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-08 00:06:48 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-08 00:06:48 -0500 |
| commit | a2c45688c094d8fa88f9ac0c3534a03fbb9a3b2a (patch) | |
| tree | f4aa4b66cce4327aebb3cad3a0695b9150ab7af3 /sal | |
| parent | c937997abd00451bd9b652083a34dd9027edb96a (diff) | |
Revert "cppcheck reduce scope of var in sal/... security.c"
This reverts commit 04028b90252888848c0fc911ea3ad3aa49d9a5b5.
use c99 construct in c, which break Microsoft
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/security.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index ac5387517515..053d39f446c1 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -469,6 +469,37 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect } else { +#if 0 + if (pSecImpl->m_hToken) + { + DWORD nInfoBuffer = 512; + UCHAR* pInfoBuffer = malloc(nInfoBuffer); + + while (!GetTokenInformation(pSecImpl->m_hToken, TokenUser, + pInfoBuffer, nInfoBuffer, &nInfoBuffer)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + pInfoBuffer = realloc(pInfoBuffer, nInfoBuffer); + else + { + free(pInfoBuffer); + pInfoBuffer = NULL; + break; + } + } + + /* not implemented */ + OSL_ASSERT(sal_False); + + if (pInfoBuffer) + { + /* if (EqualSid() ... */ + + } + } + else +#endif + bSuccess = (sal_Bool)(GetSpecialFolder(&ustrSysDir, CSIDL_PERSONAL) && (osl_File_E_None == osl_getFileURLFromSystemPath(ustrSysDir, pustrDirectory))); } @@ -548,6 +579,7 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security) LPFNLOADUSERPROFILE fLoadUserProfile = NULL; LPFNUNLOADUSERPROFILE fUnloadUserProfile = NULL; HANDLE hAccessToken = ((oslSecurityImpl*)Security)->m_hToken; + DWORD nError = 0; /* try to create user profile */ if ( !hAccessToken ) @@ -589,7 +621,7 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security) bOk = TRUE; } else - DWORD nError = GetLastError(); + nError = GetLastError(); rtl_uString_release(buffer); } |