This commit was manufactured by cvs2svn to create branch 'cr-0x5f1'.

Cherrypick from master 2007-08-03 19:41:48 UTC Dave Korn <dave.korn.cygwin@gmail.com> '	* Makefile.in (cygcheck.exe):  Add bloda.o as prerequisite, adjusting':
    newlib/libc/stdio/diprintf.c
    newlib/libc/stdio/vdiprintf.c
    winsup/utils/COPYING.dumper
    winsup/utils/bloda.cc

4 files changed, 874 insertions, 0 deletions

diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
new file mode 100644
index 0000000..171bf64
--- /dev/null
+++ b/newlib/libc/stdio/diprintf.c
@@ -0,0 +1,78 @@
+/* Copyright (C) 2005, 2007 Shaun Jackman
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+
+/*
+FUNCTION
+<<diprintf>>, <<vdiprintf>>---print to a file descriptor (integer only)
+
+INDEX
+	diprintf
+INDEX
+	vdiprintf
+
+ANSI_SYNOPSIS
+	#include <stdio.h>
+	#include <stdarg.h>
+	int diprintf(int <[fd]>, const char *<[format]>, ...);
+	int vdiprintf(int <[fd]>, const char *<[format]>, va_list <[ap]>);
+	int _diprintf_r(struct _reent *<[ptr]>, int <[fd]>,
+			const char *<[format]>, ...);
+	int _vidprintf_r(struct _reent *<[ptr]>, int <[fd]>,
+			const char *<[format]>, va_list <[ap]>);
+
+DESCRIPTION
+<<diprintf>> and <<vdiprintf>> are similar to <<dprintf>> and <<vdprintf>>,
+except that only integer format specifiers are processed.
+
+The functions <<_diprintf_r>> and <<_vdiprintf_r>> are simply
+reentrant versions of the functions above.
+
+RETURNS
+Similar to <<dprintf>> and <<vdprintf>>.
+
+PORTABILITY
+This set of functions is an integer-only extension, and is not portable.
+
+Supporting OS subroutines required: <<sbrk>>, <<write>>.
+*/
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdarg.h>
+
+int
+_DEFUN(_diprintf_r, (ptr, fd, format),
+       struct _reent *ptr _AND
+       int fd _AND
+       const char *format _DOTS)
+{
+  va_list ap;
+  int n;
+
+  va_start (ap, format);
+  n = _vdiprintf_r (ptr, fd, format, ap);
+  va_end (ap);
+  return n;
+}
+
+#ifndef _REENT_ONLY
+
+int
+_DEFUN(diprintf, (fd, format),
+       int fd _AND
+       const char *format _DOTS)
+{
+  va_list ap;
+  int n;
+
+  va_start (ap, format);
+  n = _vdiprintf_r (_REENT, fd, format, ap);
+  va_end (ap);
+  return n;
+}
+
+#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vdiprintf.c b/newlib/libc/stdio/vdiprintf.c
new file mode 100644
index 0000000..b9b9473
--- /dev/null
+++ b/newlib/libc/stdio/vdiprintf.c
@@ -0,0 +1,46 @@
+/* Copyright 2005, 2007 Shaun Jackman
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+/* doc in diprintf.c */
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdarg.h>
+
+int
+_DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
+       struct _reent *ptr _AND
+       int fd _AND
+       const char *format _AND
+       va_list ap)
+{
+  char *p;
+  char buf[512];
+  size_t n = sizeof buf;
+
+  _REENT_SMALL_CHECK_INIT (ptr);
+  p = _vasniprintf_r (ptr, buf, &n, format, ap);
+  if (!p)
+    return -1;
+  n = _write_r (ptr, fd, p, n);
+  if (p != buf)
+    _free_r (ptr, p);
+  return n;
+}
+
+#ifndef _REENT_ONLY
+
+int
+_DEFUN(vdiprintf, (fd, format, ap),
+       int fd _AND
+       const char *format _AND
+       va_list ap)
+{
+  return _vdiprintf_r (_REENT, fd, format, ap);
+}
+
+#endif /* ! _REENT_ONLY */
diff --git a/winsup/utils/COPYING.dumper b/winsup/utils/COPYING.dumper
new file mode 100644
index 0000000..623b625
--- /dev/null
+++ b/winsup/utils/COPYING.dumper
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/winsup/utils/bloda.cc b/winsup/utils/bloda.cc
new file mode 100644
index 0000000..52aa67c
--- /dev/null
+++ b/winsup/utils/bloda.cc
@@ -0,0 +1,410 @@
+/* bloda.cc
+
+   Copyright 2007 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. */
+
+#define cygwin_internal cygwin_internal_dontuse
+#include <stdio.h>
+#include <assert.h>
+#include <windows.h>
+#include <ntdef.h>
+#include <ddk/ntstatus.h>
+#include <ddk/ntapi.h>
+#undef cygwin_internal
+
+#undef DEBUGGING
+#ifdef DEBUGGING
+#define dbg_printf(ARGS) printf ARGS ; fflush (NULL)
+#else  /* !DEBUGGING */
+#define dbg_printf(ARGS) do { } while (0)
+#endif /* ?DEBUGGING */
+
+/*  This module detects applications from the Big List of Dodgy Apps,
+  a list of applications that have at some given time been shown to
+  interfere with the operation of cygwin.  It detects the presence of
+  applications on the system by looking for any of four traces an
+  installation might leave: 1) registry keys, 2) files on disk
+  3) running executables 4) loaded dlls or drivers.
+
+  At the time of writing, the BLODA amounts to:-
+
+    Sonic Solutions burning software containing DLA component
+    Norton/MacAffee/Symantec antivirus or antispyware
+    Logitech webcam software with "Logitech process monitor" service
+    Kerio, Agnitum or ZoneAlarm Personal Firewall
+    Iolo System Mechanic/AntiVirus/Firewall
+    LanDesk
+    Windows Defender 
+    Embassy Trust Suite fingerprint reader software containing wxvault.dll
+*/
+
+enum bad_app
+{
+  SONIC,    NORTON,  MACAFFEE,    SYMANTEC,
+  LOGITECH, KERIO,   AGNITUM,     ZONEALARM,
+  IOLO,     LANDESK, WINDEFENDER, EMBASSYTS
+};
+
+struct bad_app_info
+{
+  enum bad_app app_id;
+  const char *details;
+  char found_it;
+};
+
+enum bad_app_det_method
+{
+  HKLMKEY, HKCUKEY, FILENAME, PROCESSNAME, HOOKDLLNAME
+};
+
+struct bad_app_det
+{
+  enum bad_app_det_method type;
+  const char *param;
+  enum bad_app app;
+};
+
+static const struct bad_app_det dodgy_app_detects[] =
+{
+  { PROCESSNAME, "dlactrlw.exe",                                                 SONIC      },
+  { HOOKDLLNAME, "wxvault.dll",                                                  EMBASSYTS  },
+  { HKLMKEY,     "SYSTEM\\CurrentControlSet\\Services\\vsdatant",                ZONEALARM  },
+  { FILENAME,    "%windir%\\System32\\vsdatant.sys",                             ZONEALARM  },
+  { HKLMKEY,     "SYSTEM\\CurrentControlSet\\Services\\lvprcsrv",                LOGITECH   },
+  { PROCESSNAME, "LVPrcSrv.exe",                                                 LOGITECH   },
+  { FILENAME,    "%programfiles%\\common files\\logitech\\lvmvfm\\LVPrcSrv.exe", LOGITECH   },
+}; 
+
+static const size_t num_of_detects = sizeof (dodgy_app_detects) / sizeof (dodgy_app_detects[0]);
+
+static struct bad_app_info big_list_of_dodgy_apps[] =
+{
+  { SONIC,       "Sonic Solutions burning software containing DLA component"              },
+  { NORTON,      "Norton antivirus or antispyware software"                               },
+  { MACAFFEE,    "Macaffee antivirus or antispyware software"                             },
+  { SYMANTEC,    "Symantec antivirus or antispyware software"                             },
+  { LOGITECH,    "Logitech Process Monitor service"                                       },
+  { KERIO,       "Kerio Personal Firewall"                                                },
+  { AGNITUM,     "Agnitum Personal Firewall"                                              },
+  { ZONEALARM,   "ZoneAlarm Personal Firewall"                                            },
+  { IOLO,        "Iolo System Mechanic/AntiVirus/Firewall software"                       },
+  { LANDESK,     "Landesk"                                                                },
+  { WINDEFENDER, "Windows Defender"                                                       },
+  { EMBASSYTS,   "Embassy Trust Suite fingerprint reader software containing wxvault.dll" },
+};
+
+static const size_t num_of_dodgy_apps = sizeof (big_list_of_dodgy_apps) / sizeof (big_list_of_dodgy_apps[0]);
+
+/* This function is not in the ntdll export lib, so it has
+  to be looked up at runtime and called through a pointer.  */
+VOID NTAPI (*pRtlFreeUnicodeString)(PUNICODE_STRING) = NULL;
+
+static PSYSTEM_PROCESSES
+get_process_list (void)
+{
+  int n_procs = 0x100;
+  PSYSTEM_PROCESSES pslist = (PSYSTEM_PROCESSES) malloc (n_procs * sizeof *pslist);
+
+  while (NtQuerySystemInformation (SystemProcessesAndThreadsInformation,
+    pslist, n_procs * sizeof *pslist, 0) == STATUS_INFO_LENGTH_MISMATCH)
+    {
+      n_procs *= 2;
+      free (pslist);
+      pslist = (PSYSTEM_PROCESSES) malloc (n_procs * sizeof *pslist);
+    }
+  return pslist;
+}
+
+static PSYSTEM_MODULE_INFORMATION
+get_module_list (void)
+{
+  int modsize = 0x1000;
+  PSYSTEM_MODULE_INFORMATION modlist = (PSYSTEM_MODULE_INFORMATION) malloc (modsize);
+
+  while (NtQuerySystemInformation (SystemModuleInformation,
+    modlist, modsize, NULL) == STATUS_INFO_LENGTH_MISMATCH)
+    {
+      modsize *= 2;
+      free (modlist);
+      modlist = (PSYSTEM_MODULE_INFORMATION) malloc (modsize);
+    }
+  return modlist;
+}
+
+static bool
+find_process_in_list (PSYSTEM_PROCESSES pslist, PUNICODE_STRING psname)
+{
+  while (1)
+    {
+      if (pslist->ProcessName.Length && pslist->ProcessName.Buffer)
+        {
+          dbg_printf (("%S\n", pslist->ProcessName.Buffer));
+          if (!_wcsicmp (pslist->ProcessName.Buffer, psname->Buffer))
+            return true;
+        }
+      if (!pslist->NextEntryDelta)
+        break;
+      pslist = (PSYSTEM_PROCESSES)(pslist->NextEntryDelta + (char *)pslist);
+    };
+  return false;
+}
+
+static bool
+find_module_in_list (PSYSTEM_MODULE_INFORMATION modlist, const char * const modname)
+{
+  PSYSTEM_MODULE_INFORMATION_ENTRY modptr = &modlist->Module[0];
+  DWORD count = modlist->Count;
+  while (count--)
+    {
+      dbg_printf (("name '%s' offset %d ", &modptr->ImageName[0], modptr->PathLength));
+      dbg_printf (("= '%s'\n", &modptr->ImageName[modptr->PathLength]));
+      if (!_stricmp (&modptr->ImageName[modptr->PathLength], modname))
+        return true;
+      modptr++;
+    }
+  return false;
+}
+
+static bool
+expand_path (const char *path, char *outbuf)
+{
+  char *dst = outbuf;
+  const char *end, *envval;
+  char envvar[MAX_PATH];
+  size_t len;
+
+  while ((dst - outbuf) < MAX_PATH)
+    {
+      if (*path != '%')
+        {
+          if ((*dst++ = *path++) != 0)
+            continue;
+          break;
+        }
+      /* Expand an environ var.  */
+      end = path + 1;
+      while (*end != '%')
+        {
+          /* Watch out for unterminated %  */
+          if (*end++ == 0)
+            {
+              end = NULL;
+              break;
+            }
+        }
+      /* If we didn't find the end, can't expand it.  */
+      if ((end == NULL) || (end == (path + 1)))
+        {
+          /* Unterminated % so copy verbatim.  */
+          *dst++ = *path++;
+          continue;
+        }
+      /* Expand the environment var into the new path.  */
+      if ((end - (path + 1)) >= MAX_PATH)
+        return -1;
+      memcpy (envvar, path + 1, end - (path + 1));
+      envvar[end - (path + 1)] = 0;
+      envval = getenv (envvar);
+      /* If not found, copy env var name verbatim.  */
+      if (envval == NULL)
+        {
+          *dst++ = *path++;
+          continue;
+        }
+      /* Check enough room before copying.  */
+      len = strlen (envval);
+      if ((dst + len - outbuf) >= MAX_PATH)
+        return false;
+      memcpy (dst, envval, len);
+      dst += len;
+      /* And carry on past the end of env var name.  */
+      path = end + 1;
+    }
+  return (dst - outbuf) < MAX_PATH;
+}
+
+static bool 
+detect_dodgy_app (const struct bad_app_det *det, PSYSTEM_PROCESSES pslist, PSYSTEM_MODULE_INFORMATION modlist)
+{
+  HANDLE fh;
+  HKEY hk;
+  UNICODE_STRING unicodename;
+  ANSI_STRING ansiname;
+  NTSTATUS rv;
+  bool found;
+  char expandedname[MAX_PATH];
+
+  switch (det->type)
+    {
+    case HKLMKEY:
+      dbg_printf (("Detect reg key hklm '%s'... ", det->param));
+      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, det->param, 0, STANDARD_RIGHTS_READ, &hk) == ERROR_SUCCESS)
+        {
+          RegCloseKey (hk);
+          dbg_printf (("found!\n"));
+          return true;
+        }
+      break;
+
+    case HKCUKEY:
+      dbg_printf (("Detect reg key hkcu '%s'... ", det->param));
+      if (RegOpenKeyEx (HKEY_CURRENT_USER, det->param, 0, STANDARD_RIGHTS_READ, &hk) == ERROR_SUCCESS)
+        {
+          RegCloseKey (hk);
+          dbg_printf (("found!\n"));
+          return true;
+        }
+      break;
+
+    case FILENAME:
+      dbg_printf (("Detect filename '%s'... ", det->param));
+      if (!expand_path (det->param, expandedname))
+        {
+          printf ("Expansion failure!\n");
+          break;
+        }
+      dbg_printf (("('%s' after expansion)... ", expandedname));
+      fh = CreateFile (expandedname, 0, FILE_SHARE_READ | FILE_SHARE_WRITE
+        | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL);
+      if (fh != INVALID_HANDLE_VALUE)
+        {
+          CloseHandle (fh);
+          dbg_printf (("found!\n"));
+          return true;
+        }
+      break;
+
+    case PROCESSNAME:
+      dbg_printf (("Detect proc name '%s'... ", det->param));
+      /* Equivalent of RtlInitAnsiString.  */
+      ansiname.Length = ansiname.MaximumLength = strlen (det->param);
+      ansiname.Buffer = (CHAR *) det->param;
+      rv = RtlAnsiStringToUnicodeString (&unicodename, &ansiname, TRUE);
+      if (rv != STATUS_SUCCESS)
+        {
+          printf ("Ansi to unicode conversion failure $%08x\n", (unsigned int) rv);
+          break;
+        }
+      found = find_process_in_list (pslist, &unicodename);
+      if (!pRtlFreeUnicodeString)
+          pRtlFreeUnicodeString = (VOID NTAPI (*)(PUNICODE_STRING)) GetProcAddress (LoadLibrary ("ntdll.dll"), "RtlFreeUnicodeString");
+      if (pRtlFreeUnicodeString)
+        pRtlFreeUnicodeString (&unicodename);
+      else
+        printf ("leaking mem...oops\n");
+      if (found)
+        {
+          dbg_printf (("found!\n"));
+          return true;
+        }
+      break;
+
+    case HOOKDLLNAME:
+      dbg_printf (("Detect hookdll '%s'... ", det->param));
+      if (find_module_in_list (modlist, det->param))
+        {
+          dbg_printf (("found!\n"));
+          return true;
+        }
+      break;
+
+    }
+  dbg_printf (("not found.\n"));
+  return false;
+}
+
+static struct bad_app_info *
+find_dodgy_app_info (enum bad_app which_app)
+{
+  size_t i;
+  for (i = 0; i < num_of_dodgy_apps; i++)
+    {
+      if (big_list_of_dodgy_apps[i].app_id == which_app)
+        return &big_list_of_dodgy_apps[i];
+    }
+  return NULL;
+}
+
+/* External entrypoint called from cygcheck.cc/dump_sysinfo.  */
+void
+dump_dodgy_apps (int verbose)
+{
+  size_t i, n_det = 0;
+  PSYSTEM_PROCESSES pslist;
+  PSYSTEM_MODULE_INFORMATION modlist;
+
+  /* Read system info for detect testing.  */
+  pslist = get_process_list ();
+  modlist = get_module_list ();
+
+  /* Go with builtin list for now; later may enhance to
+  read dodgy apps from a file or download from an URL.  */
+  for (i = 0; i < num_of_dodgy_apps; i++)
+    {
+      big_list_of_dodgy_apps[i].found_it = false;
+    }
+
+  for (i = 0; i < num_of_detects; i++)
+    {
+      const struct bad_app_det *det = &dodgy_app_detects[i];
+      struct bad_app_info *found = find_dodgy_app_info (det->app);
+      bool detected = detect_dodgy_app (det, pslist, modlist);
+
+      /* Not found would mean we coded the lists bad. */
+      assert (found);
+      if (detected)
+        {
+          ++n_det;
+          found->found_it |= (1 << det->type);
+        }
+    }
+  if (n_det)
+    {
+      printf ("\nPotential app conflicts:\n\n");
+      for (i = 0; i < num_of_dodgy_apps; i++)
+        {
+          if (big_list_of_dodgy_apps[i].found_it)
+            {
+              printf ("%s%s", big_list_of_dodgy_apps[i].details, 
+                verbose ? "\nDetected: " : ".\n");
+              if (!verbose)
+                continue;
+              const char *sep = "";
+              if (big_list_of_dodgy_apps[i].found_it & (1 << HKLMKEY))
+                {
+                  printf ("HKLM Registry Key");
+                  sep = ", ";
+                }
+              if (big_list_of_dodgy_apps[i].found_it & (1 << HKCUKEY))
+                {
+                  printf ("%sHKCU Registry Key", sep);
+                  sep = ", ";
+                }
+              if (big_list_of_dodgy_apps[i].found_it & (1 << FILENAME))
+                {
+                  printf ("%sNamed file", sep);
+                  sep = ", ";
+                }
+              if (big_list_of_dodgy_apps[i].found_it & (1 << PROCESSNAME))
+                {
+                  printf ("%sNamed process", sep);
+                  sep = ", ";
+                }
+              if (big_list_of_dodgy_apps[i].found_it & (1 << HOOKDLLNAME))
+                {
+                  printf ("%sLoaded hook DLL", sep);
+                }
+              printf (".\n\n");
+            }
+        }
+    }
+  /* Tidy up allocations.  */
+  free (pslist);
+  free (modlist);
+}
+