diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-11 20:41:51 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-11 20:41:51 +0400 |
| commit | 6e1e3bb8e55374b16c2d57297066b088c0cda9a0 (patch) | |
| tree | fea006876e83f178829de7768aff65fe0305b47b /winsup/utils/cygcheck.cc | |
| parent | 4a4f6f949ce7758575552fb781988c4e3c7951d4 (diff) | |
* Makefile.in (cygcheck.exe): Link against psapi.dll.
* bloda.cc: Change include section to work with Mingw64 headers.
Include psapi.h. Use SystemProcessInformation instead of
SystemProcessesAndThreadsInformation throughout and add define for
w32api headers. Ditto for PSYSTEM_PROCESS_INFORMATION vs.
PSYSTEM_PROCESSES.
(system_module_list): New type to replace SYSTEM_MODULE_INFORMATION.
Change usage throughout accordingly.
(get_module_list): Fetch module list using PSAPI functions
EnumDeviceDrivers and GetDeviceDriverBaseNameA.
* cygcheck.cc (max): Define as __max if not defined already.
(alloca): Only define if not defined already.
(handle_unique_object_name): Use explicit sharing flags rather than
FILE_SHARE_VALID_FLAGS which officially is only available in DDK
headers.
(PRODUCT_ULTIMATE_E): Only define if not defined already.
* dump_setup.cc: Change include section to work with Mingw64 headers.
(NtQueryAttributesFile): Drop NTOSAPI aka DECLSPEC_IMPORT.
* strace.cc: Change include section to work with Mingw64 headers.
(alloca): Only define if not defined already.
Diffstat (limited to 'winsup/utils/cygcheck.cc')
| -rw-r--r-- | winsup/utils/cygcheck.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 5e603757f..de45addd2 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -30,7 +30,13 @@ #undef cygwin_internal #include "loadlib.h" +#ifndef max +#define max __max +#endif + +#ifndef alloca #define alloca __builtin_alloca +#endif int verbose = 0; int registry = 0; @@ -1314,7 +1320,7 @@ handle_unique_object_name (int opt, char *path) if (opt == CO_SHOW_UON) { access = GENERIC_READ; - share = FILE_SHARE_VALID_FLAGS; + share = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; protect = PAGE_READONLY; mapping = FILE_MAP_READ; } @@ -1447,7 +1453,9 @@ dump_sysinfo () &prod)) { #define PRODUCT_UNLICENSED 0xabcdabcd +#ifndef PRODUCT_ULTIMATE_E #define PRODUCT_ULTIMATE_E 0x00000047 +#endif const char *products[] = { /* 0x00000000 */ "", |