9119d13db8
(DestroyEnvironmentBlock): Import. * environ.cc (env_compare): New static bsearch comparison function. (build_env): Add parameter taking a user token. If token is non-NULL, fetch user's default Windows environment and merge it into the resulting environment. Explain what we do in preceeding comment. * environ,h (build_env): Align prototype to above change. * external.cc (create_winenv): Call build_env with NULL token. * spawn.cc (child_info_spawn::worker): When spawning new process under another user account, call build_env with new token to allow merging user's default Windows environment. * winlean.h (_USERENV_): Define to override dllimport.
98 lines
3.0 KiB
C
98 lines
3.0 KiB
C
/* winlean.h - Standard "lean" windows include
|
|
|
|
Copyright 2010, 2011, 2012, 2013, 2014 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. */
|
|
|
|
#ifndef _WINLEAN_H
|
|
#define _WINLEAN_H 1
|
|
#define WIN32_LEAN_AND_MEAN 1
|
|
|
|
/* The following macros have to be defined, otherwise the autoload mechanism
|
|
in autoload.cc leads to "multiple definition" errors. The macros control
|
|
the declarations of symbols in the Mingw64 w32api headers. If they are
|
|
not defined, a DECLSPEC_IMPORT will be added to the symbol declarations.
|
|
This leads to a definition of the symbols in the sources using the
|
|
autoloaded symbols, which in turn clashes with the definition in the
|
|
w32api library exporting the symbols. */
|
|
#define _ADVAPI32_
|
|
#define _DSGETDCAPI_
|
|
#define _GDI32_
|
|
#define _KERNEL32_
|
|
#define _NORMALIZE_
|
|
#define _OLE32_
|
|
#define _SHELL32_
|
|
#define _SPOOL32_
|
|
#define _USER32_
|
|
#define _USERENV_
|
|
#define _WINMM_
|
|
#define WINIMPM
|
|
#define WINSOCK_API_LINKAGE
|
|
|
|
/* Windows headers define a couple of annoyingly intrusive macros for the
|
|
sole purpose of inline documentation. Since they are defined without
|
|
respect for the namespace and not undef'ed anymore, they tend to collide
|
|
with otherwise innocent definitions in the application. We check if they
|
|
exist and if not, we undef them again after including the Windows headers. */
|
|
#ifndef IN
|
|
#define __undef_IN
|
|
#endif
|
|
#ifndef OUT
|
|
#define __undef_OUT
|
|
#endif
|
|
#ifndef OPTIONAL
|
|
#define __undef_OPTIONAL
|
|
#endif
|
|
#ifndef NOTHING
|
|
#define __undef_NOTHING
|
|
#endif
|
|
#ifndef CRITICAL
|
|
#define __undef_CRITICAL
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
#include <wincrypt.h>
|
|
#include <lmcons.h>
|
|
#include <ntdef.h>
|
|
|
|
#ifdef __undef_IN
|
|
#undef IN
|
|
#endif
|
|
#ifdef __undef_OUT
|
|
#undef OUT
|
|
#endif
|
|
#ifdef __undef_OPTIONAL
|
|
#undef OPTIONAL
|
|
#endif
|
|
#ifdef __undef_NOTHING
|
|
#undef NOTHING
|
|
#endif
|
|
#ifdef __undef_CRITICAL
|
|
#undef CRITICAL
|
|
#endif
|
|
|
|
/* So-called "Microsoft Account" SIDs (S-1-11-...) have a netbios domain name
|
|
"MicrosoftAccounts". The new "Application Container SIDs" (S-1-15-...)
|
|
have a netbios domain name "APPLICATION PACKAGE AUTHORITY"
|
|
|
|
The problem is, DNLEN is 15, but these domain names have a length of 16
|
|
resp. 29 chars :-P So we override DNLEN here to be 31, so that calls
|
|
to LookupAccountSid/Name don't fail if the buffer is based on DNLEN.
|
|
Hope that's enough for a while... */
|
|
#undef DNLEN
|
|
#define DNLEN 31
|
|
|
|
/* When Terminal Services are installed, the GetWindowsDirectory function
|
|
does not return the system installation dir, but a user specific directory
|
|
instead. That's not what we have in mind when calling GetWindowsDirectory
|
|
from within Cygwin. So we redefine GetWindowsDirectory to something
|
|
invalid here to avoid that it's called accidentally in Cygwin. Don't
|
|
use this function. Use GetSystemWindowsDirectoryW. */
|
|
#define GetWindowsDirectoryW dont_use_GetWindowsDirectory
|
|
#define GetWindowsDirectoryA dont_use_GetWindowsDirectory
|
|
#endif /*_WINLEAN_H*/
|