From 4e7ee302a926d9d7dd4922f860e1d835ee136530 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sun, 18 Jan 2009 18:40:02 +0000 Subject: [PATCH] - Fix regexpl build svn path=/trunk/; revision=38906 --- rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp | 4 ++-- rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp | 4 ++-- rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp index 3fa80b1b9a5..b49d3650787 100644 --- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp +++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp @@ -139,7 +139,7 @@ CheckDACLArgument: rConsole.Write(_T("\\")); rConsole.Write(Key.GetKeyName()); rConsole.Write(_T("\n")); - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; TCHAR *pchName = NULL, *pchDomainName = NULL; try { @@ -147,7 +147,7 @@ CheckDACLArgument: if (nError != ERROR_SUCCESS) throw nError; - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; DWORD dwSecurityDescriptorLength1 = dwSecurityDescriptorLength; nError = Key.GetSecurityDescriptor((SECURITY_INFORMATION)DACL_SECURITY_INFORMATION,pSecurityDescriptor,&dwSecurityDescriptorLength1); if (nError != ERROR_SUCCESS) diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp index 8a5384728ca..c8a8bcb32d7 100644 --- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp +++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp @@ -132,7 +132,7 @@ CheckOwnerArgument: return 0; } - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; TCHAR *pchName = NULL, *pchDomainName = NULL; try { @@ -144,7 +144,7 @@ CheckOwnerArgument: dwError = Key.GetSecurityDescriptorLength(&dwSecurityDescriptorLength); if (dwError != ERROR_SUCCESS) throw dwError; - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; DWORD dwSecurityDescriptorLength1 = dwSecurityDescriptorLength; dwError = Key.GetSecurityDescriptor((SECURITY_INFORMATION)OWNER_SECURITY_INFORMATION,pSecurityDescriptor,&dwSecurityDescriptorLength1); if (dwError != ERROR_SUCCESS) throw dwError; diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp index f6c5034a75e..c4da5db0750 100644 --- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp +++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp @@ -75,7 +75,7 @@ int CShellCommandSACL::Execute(CConsole &rConsole, CArgumentParser& rArguments) const TCHAR *pszParameter; const TCHAR *pszCommandItself = rArguments.GetNextArgument(); DWORD dwError; - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; CSecurityDescriptor sd; HANDLE hThreadToken = INVALID_HANDLE_VALUE; @@ -220,7 +220,7 @@ CheckSACLArgument: goto Error; } - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; if (!pSecurityDescriptor) { _tcsncpy(pszError_msg,_T("\nOut of memory.\n"),ERROR_MSG_BUFFER_SIZE-1);