* Makefile.in (DLL_OFILES): Add avapi32.o.

	* advapi32.cc: New file.
	* autoload.cc: Add block of remaining advapi32 functions used by
	Cygwin.  Keep commented out.  Explain why.

4 files changed, 355 insertions, 12 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9e7d53fad..660a5eeeb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-01  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in (DLL_OFILES): Add avapi32.o.
+	* advapi32.cc: New file.
+	* autoload.cc: Add block of remaining advapi32 functions used by
+	Cygwin.  Keep commented out.  Explain why.
+
 2011-04-01  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* fhandler_proc.cc (format_proc_loadavg): Add running/total
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 10743eab8..1b5b48806 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -135,18 +135,18 @@ DLL_IMPORTS:=$(w32api_lib)/libadvapi32.a $(w32api_lib)/libkernel32.a $(w32api_li
 MT_SAFE_OBJECTS:=
 # Please maintain this list in sorted order, with maximum files per 86 col line
 #
-DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \
-	cygtls.o cygxdr.o dcrt0.o debug.o devices.o dir.o dlfcn.o dll_init.o \
-	dtable.o environ.o errno.o exceptions.o exec.o external.o fcntl.o fenv.o \
-	fhandler.o fhandler_clipboard.o fhandler_console.o fhandler_disk_file.o \
-	fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o fhandler_mailslot.o \
-	fhandler_mem.o fhandler_netdrive.o fhandler_nodevice.o fhandler_proc.o \
-	fhandler_process.o fhandler_procnet.o fhandler_procsys.o fhandler_random.o \
-	fhandler_raw.o fhandler_registry.o fhandler_serial.o fhandler_socket.o \
-	fhandler_tape.o fhandler_termios.o fhandler_tty.o fhandler_virtual.o \
-	fhandler_windows.o fhandler_zero.o flock.o fnmatch.o fork.o fts.o ftw.o \
-	getopt.o glob.o glob_pattern_p.o globals.o grp.o heap.o hookapi.o \
-	inet_addr.o inet_network.o init.o ioctl.o ipc.o kernel32.o \
+DLL_OFILES:=advapi32.o assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o \
+	cygthread.o cygtls.o cygxdr.o dcrt0.o debug.o devices.o dir.o dlfcn.o \
+	dll_init.o dtable.o environ.o errno.o exceptions.o exec.o external.o \
+	fcntl.o fenv.o fhandler.o fhandler_clipboard.o fhandler_console.o \
+	fhandler_disk_file.o fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o \
+	fhandler_mailslot.o fhandler_mem.o fhandler_netdrive.o fhandler_nodevice.o \
+	fhandler_proc.o fhandler_process.o fhandler_procnet.o fhandler_procsys.o \
+	fhandler_random.o fhandler_raw.o fhandler_registry.o fhandler_serial.o \
+	fhandler_socket.o fhandler_tape.o fhandler_termios.o fhandler_tty.o \
+	fhandler_virtual.o fhandler_windows.o fhandler_zero.o flock.o fnmatch.o \
+	fork.o fts.o ftw.o getopt.o glob.o glob_pattern_p.o globals.o grp.o heap.o \
+	hookapi.o inet_addr.o inet_network.o init.o ioctl.o ipc.o kernel32.o \
 	libstdcxx_wrapper.o localtime.o lsearch.o malloc_wrapper.o \
 	minires-os-if.o minires.o miscfuncs.o mktemp.o mmap.o msg.o \
 	mount.o net.o netdb.o nfs.o nftw.o nlsfuncs.o ntea.o passwd.o path.o \
diff --git a/winsup/cygwin/advapi32.cc b/winsup/cygwin/advapi32.cc
new file mode 100644
index 000000000..a53f1ff01
--- /dev/null
+++ b/winsup/cygwin/advapi32.cc
@@ -0,0 +1,305 @@
+/* advapi32.cc: Win32 replacement functions.
+
+   Copyright 2011 Red Hat, Inc.
+
+This file is part of Cygwin.
+
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
+
+#include "winsup.h"
+#include <winioctl.h>
+#include "shared_info.h"
+#include "ntdll.h"
+#include <wchar.h>
+
+#define DEFAULT_NTSTATUS_TO_BOOL_RETURN \
+  if (!NT_SUCCESS (status)) \
+    SetLastError (RtlNtStatusToDosError (status)); \
+  return NT_SUCCESS (status);
+
+BOOL WINAPI
+AllocateLocallyUniqueId (PLUID luid)
+{
+  NTSTATUS status = NtAllocateLocallyUniqueId (luid);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+AccessCheck (PSECURITY_DESCRIPTOR sd, HANDLE tok, DWORD access,
+	     PGENERIC_MAPPING mapping, PPRIVILEGE_SET pset, LPDWORD psetlen,
+	     LPDWORD granted, LPBOOL allowed)
+{
+  NTSTATUS status, astatus;
+
+  status = NtAccessCheck (sd, tok, access, mapping, pset, psetlen, granted,
+			  &astatus);
+  if (NT_SUCCESS (status))
+    *allowed = NT_SUCCESS (astatus);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+PrivilegeCheck (HANDLE tok, PPRIVILEGE_SET pset, LPBOOL res)
+{
+  NTSTATUS status = NtPrivilegeCheck (tok, pset, (PBOOLEAN) res);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+InitializeSid (PSID sid, PSID_IDENTIFIER_AUTHORITY auth, BYTE count)
+{
+  NTSTATUS status = RtlInitializeSid (sid, auth, count);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+EqualSid (PSID sid1, PSID sid2)
+{
+  return !!RtlEqualSid (sid1, sid2);
+}
+
+BOOL WINAPI
+EqualPrefixSid (PSID sid1, PSID sid2)
+{
+  return !!RtlEqualPrefixSid (sid1, sid2);
+}
+
+BOOL WINAPI
+CopySid (DWORD len, PSID dest, PSID src)
+{
+  NTSTATUS status = RtlCopySid (len, dest, src);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+DWORD WINAPI
+GetLengthSid (PSID sid)
+{
+  return RtlLengthSid (sid);
+}
+
+PDWORD WINAPI
+GetSidSubAuthority (PSID sid, DWORD subauth)
+{
+  return RtlSubAuthoritySid (sid, subauth);
+}
+
+PUCHAR WINAPI
+GetSidSubAuthorityCount (PSID sid)
+{
+  return RtlSubAuthorityCountSid (sid);
+}
+
+PSID_IDENTIFIER_AUTHORITY WINAPI
+GetSidIdentifierAuthority (PSID sid)
+{
+  return RtlIdentifierAuthoritySid (sid);
+}
+
+BOOL WINAPI
+InitializeAcl (PACL acl, DWORD len, DWORD revision)
+{
+  NTSTATUS status = RtlCreateAcl (acl, len, revision);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+AddAccessAllowedAce (PACL acl, DWORD revision, DWORD mask, PSID sid)
+{
+  NTSTATUS status = RtlAddAccessAllowedAce (acl, revision, mask, sid);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+AddAccessDeniedAce (PACL acl, DWORD revision, DWORD mask, PSID sid)
+{
+  NTSTATUS status = RtlAddAccessDeniedAce (acl, revision, mask, sid);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+AddAce (PACL acl, DWORD revision, DWORD index, LPVOID ace_list, DWORD len)
+{
+  NTSTATUS status = RtlAddAce (acl, revision, index, ace_list, len);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+FindFirstFreeAce (PACL acl, LPVOID *ace)
+{
+  NTSTATUS status = RtlFirstFreeAce (acl, ace);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+GetAce (PACL acl, DWORD index, LPVOID *ace)
+{
+  NTSTATUS status = RtlGetAce (acl, index, ace);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+InitializeSecurityDescriptor (PSECURITY_DESCRIPTOR sd, DWORD revision)
+{
+  NTSTATUS status = RtlCreateSecurityDescriptor (sd, revision);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+MakeSelfRelativeSD (PSECURITY_DESCRIPTOR abs_sd, PSECURITY_DESCRIPTOR rel_sd,
+		    LPDWORD len)
+{
+  NTSTATUS status = RtlAbsoluteToSelfRelativeSD (abs_sd, rel_sd, len);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+GetSecurityDescriptorDacl (PSECURITY_DESCRIPTOR sd, LPBOOL present, PACL *dacl,
+			   LPBOOL def)
+{
+  NTSTATUS status = RtlGetDaclSecurityDescriptor (sd, (PBOOLEAN) present, dacl,
+						  (PBOOLEAN) def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+SetSecurityDescriptorDacl (PSECURITY_DESCRIPTOR sd, BOOL present, PACL dacl,
+			   BOOL def)
+{
+  NTSTATUS status = RtlSetDaclSecurityDescriptor (sd, (BOOLEAN) !!present, dacl,
+						  (BOOLEAN) !!def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+GetSecurityDescriptorGroup (PSECURITY_DESCRIPTOR sd, PSID *sid, LPBOOL def)
+{
+  NTSTATUS status = RtlGetGroupSecurityDescriptor (sd, sid, (PBOOLEAN) def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+SetSecurityDescriptorGroup (PSECURITY_DESCRIPTOR sd, PSID sid, BOOL def)
+{
+  NTSTATUS status = RtlSetGroupSecurityDescriptor (sd, sid, (BOOLEAN) !!def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+GetSecurityDescriptorOwner (PSECURITY_DESCRIPTOR sd, PSID *sid, LPBOOL def)
+{
+  NTSTATUS status = RtlGetOwnerSecurityDescriptor (sd, sid, (PBOOLEAN) def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+SetSecurityDescriptorOwner (PSECURITY_DESCRIPTOR sd, PSID sid, BOOL def)
+{
+  NTSTATUS status = RtlSetOwnerSecurityDescriptor (sd, sid, (BOOLEAN) !!def);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+OpenProcessToken (HANDLE process, DWORD access, PHANDLE tok)
+{
+  NTSTATUS status = NtOpenProcessToken (process, access, tok);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+OpenThreadToken (HANDLE thread, DWORD access, BOOL as_self, PHANDLE tok)
+{
+  NTSTATUS status = NtOpenThreadToken (thread, access, as_self, tok);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+GetTokenInformation(HANDLE tok, TOKEN_INFORMATION_CLASS infoclass, LPVOID buf,
+		    DWORD len, PDWORD retlen)
+{
+  NTSTATUS status = NtQueryInformationToken (tok, infoclass, buf, len, retlen);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+SetTokenInformation (HANDLE tok, TOKEN_INFORMATION_CLASS infoclass, PVOID buf,
+		     ULONG len)
+{
+  NTSTATUS status = NtSetInformationToken (tok, infoclass, buf, len);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+RevertToSelf ()
+{
+  HANDLE tok = NULL;
+  NTSTATUS status = NtSetInformationThread (NtCurrentThread (),
+					    ThreadImpersonationToken,
+					    &tok, sizeof tok);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+DuplicateTokenEx (HANDLE tok, DWORD access, LPSECURITY_ATTRIBUTES sec_attr,
+		  SECURITY_IMPERSONATION_LEVEL level, TOKEN_TYPE type,
+		  PHANDLE new_tok)
+{
+  SECURITY_QUALITY_OF_SERVICE sqos =
+    { sizeof sqos, level, SECURITY_STATIC_TRACKING, FALSE };
+  OBJECT_ATTRIBUTES attr =
+    { sizeof attr, NULL, NULL,
+      sec_attr && sec_attr->bInheritHandle? OBJ_INHERIT : 0,
+      sec_attr ? sec_attr->lpSecurityDescriptor : NULL, &sqos };
+  NTSTATUS status = NtDuplicateToken (tok, access, &attr, FALSE, type, new_tok);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL WINAPI
+ImpersonateLoggedOnUser (HANDLE tok)
+{
+  NTSTATUS status;
+  HANDLE ptok = NULL;
+  TOKEN_TYPE type;
+  ULONG size;
+
+  status = NtQueryInformationToken (tok, TokenType, &type, sizeof type, &size);
+  if (!NT_SUCCESS (status))
+    {
+      SetLastError (RtlNtStatusToDosError (status));
+      return FALSE;
+    }
+  if (type == TokenPrimary)
+    {
+      /* If its a primary token it must be converted to an impersonated
+	 token. */
+      SECURITY_QUALITY_OF_SERVICE sqos =
+	{ sizeof sqos, SecurityImpersonation, SECURITY_DYNAMIC_TRACKING, FALSE};
+      OBJECT_ATTRIBUTES attr =
+	{ sizeof attr, NULL, NULL, 0, NULL, &sqos };
+
+      /* The required rights for the impersonation token according to MSDN. */
+      status = NtDuplicateToken (tok, TOKEN_QUERY | TOKEN_IMPERSONATE,
+				 &attr, FALSE, TokenImpersonation, &ptok);
+      if (!NT_SUCCESS (status))
+	{
+	  SetLastError (RtlNtStatusToDosError (status));
+	  return FALSE;
+	}
+      tok = ptok;
+    }
+  status = NtSetInformationThread (NtCurrentThread (), ThreadImpersonationToken,
+				   &tok, sizeof tok);
+  if (ptok)
+    NtClose (ptok);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
+
+BOOL
+ImpersonateNamedPipeClient (HANDLE pipe)
+{
+  IO_STATUS_BLOCK io;
+  NTSTATUS status = NtFsControlFile (pipe, NULL, NULL, NULL, &io,
+				     FSCTL_PIPE_IMPERSONATE, NULL, 0, NULL, 0);
+  DEFAULT_NTSTATUS_TO_BOOL_RETURN
+}
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index ea3d741ae..d683cd8ed 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -352,6 +352,37 @@ wsock_init ()
 
 LoadDLLprime (ws2_32, _wsock_init, 0)
 
+#if 0
+/* Don't enable until libadvapi32.a has been removed from DLL_IMPORTS,
+   otherwise mintty will stop working on pre-Vista for some reason. */
+LoadDLLfunc (CreateProcessAsUserW, 44, advapi32)
+LoadDLLfunc (CryptAcquireContextW, 20, advapi32)
+LoadDLLfunc (CryptGenRandom, 12, advapi32)
+LoadDLLfunc (CryptReleaseContext, 8, advapi32)
+LoadDLLfunc (DeregisterEventSource, 4, advapi32)
+LoadDLLfunc (GetSecurityInfo, 32, advapi32)
+LoadDLLfunc (LogonUserW, 24, advapi32)
+LoadDLLfunc (LookupAccountNameW, 28, advapi32)
+LoadDLLfunc (LookupAccountSidW, 28, advapi32)
+LoadDLLfunc (LsaClose, 4, advapi32)
+LoadDLLfunc (LsaEnumerateAccountRights, 16, advapi32)
+LoadDLLfunc (LsaFreeMemory, 4, advapi32)
+LoadDLLfunc (LsaOpenPolicy, 16, advapi32)
+LoadDLLfunc (LsaQueryInformationPolicy, 12, advapi32)
+LoadDLLfunc (LsaRetrievePrivateData, 12, advapi32)
+LoadDLLfunc (LsaStorePrivateData, 12, advapi32)
+LoadDLLfunc (RegCloseKey, 4, advapi32)
+LoadDLLfunc (RegCreateKeyExW, 36, advapi32)
+LoadDLLfunc (RegEnumKeyExW, 32, advapi32)
+LoadDLLfunc (RegEnumValueW, 32, advapi32)
+LoadDLLfunc (RegGetKeySecurity, 16, advapi32)
+LoadDLLfunc (RegOpenKeyExW, 20, advapi32)
+LoadDLLfunc (RegQueryInfoKeyW, 48, advapi32)
+LoadDLLfunc (RegQueryValueExW, 24, advapi32)
+LoadDLLfunc (RegisterEventSourceW, 8, advapi32)
+LoadDLLfunc (ReportEventW, 36, advapi32)
+#endif
+
 LoadDLLfuncEx2 (DnsQuery_A, 24, dnsapi, 1, 127) // ERROR_PROC_NOT_FOUND
 LoadDLLfuncEx (DnsRecordListFree, 8, dnsapi, 1)