- Fix regexpl build
authorStefan Ginsberg <stefanginsberg@gmail.com>
Sun, 18 Jan 2009 18:40:02 +0000 (18:40 +0000)
committerStefan Ginsberg <stefanginsberg@gmail.com>
Sun, 18 Jan 2009 18:40:02 +0000 (18:40 +0000)
svn path=/trunk/; revision=38906

rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp

index 3fa80b1..b49d365 100644 (file)
@@ -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)
index 8a53847..c8a8bcb 100644 (file)
@@ -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;
index f6c5034..c4da5db 100644 (file)
@@ -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);