Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboard/internal.h
	xorg-server/hw/xwin/winclipboard/thread.c
	xorg-server/hw/xwin/winclipboard/wndproc.c
	xorg-server/hw/xwin/winclipboard/xevents.c
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winglobals.c

2 files changed, 36 insertions, 63 deletions

diff --git a/tools/plink/version.c b/tools/plink/version.c
index 16347ca19..f6086127e 100644
--- a/tools/plink/version.c
+++ b/tools/plink/version.c
@@ -1,63 +1,20 @@
-/*

- * PuTTY version numbering

- */

-

-#define STR1(x) #x

-#define STR(x) STR1(x)

-

-#ifdef INCLUDE_EMPTY_H

-/*

- * Horrible hack to force version.o to be rebuilt unconditionally in

- * the automake world: empty.h is an empty header file, created by the

- * makefile and forcibly updated every time make is run. Including it

- * here causes automake to track it as a dependency, which will cause

- * version.o to be rebuilt too.

- *

- * The space between # and include causes mkfiles.pl's dependency

- * scanner (for all other makefile types) to ignore this include,

- * which is correct because only the automake makefile passes

- * -DINCLUDE_EMPTY_H to enable it.

- */

-# include "empty.h"

-#endif

-

-#if defined SNAPSHOT

-

-#if defined SVN_REV

-#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV)

-#else

-#define SNAPSHOT_TEXT STR(SNAPSHOT)

-#endif

-

-char ver[] = "Development snapshot " SNAPSHOT_TEXT;

-char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT;

-

-#undef SNAPSHOT_TEXT

-

-#elif defined RELEASE

-

-char ver[] = "Release " STR(RELEASE);

-char sshver[] = "PuTTY-Release-" STR(RELEASE);

-

-#elif defined PRERELEASE

-

-char ver[] = "Pre-release " STR(PRERELEASE) ":r" STR(SVN_REV);

-char sshver[] = "PuTTY-Prerelease-" STR(PRERELEASE) ":r" STR(SVN_REV);

-

-#elif defined SVN_REV

-

-char ver[] = "Custom build r" STR(SVN_REV) ", " __DATE__ " " __TIME__;

-char sshver[] = "PuTTY-Custom-r" STR(SVN_REV);

-

-#else

-

-char ver[] = "Unidentified build, " __DATE__ " " __TIME__;

-char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__;

-

-#endif

-

-/*

- * SSH local version string MUST be under 40 characters. Here's a

- * compile time assertion to verify this.

- */

-enum { vorpal_sword = 1 / (sizeof(sshver) <= 40) };

+/*
+ * PuTTY version numbering
+ */
+
+/*
+ * The difficult part of deciding what goes in these version strings
+ * is done in Buildscr, and then written into version.h. All we have
+ * to do here is to drop it into variables of the right names.
+ */
+
+#include "version.h"
+
+char ver[] = TEXTVER;
+char sshver[] = SSHVER;
+
+/*
+ * SSH local version string MUST be under 40 characters. Here's a
+ * compile time assertion to verify this.
+ */
+enum { vorpal_sword = 1 / (sizeof(sshver) <= 40) };
diff --git a/tools/plink/winshare.c b/tools/plink/winshare.c
index 89c1cc325..a63325cb8 100644
--- a/tools/plink/winshare.c
+++ b/tools/plink/winshare.c
@@ -16,6 +16,22 @@
 
 #include "winsecur.h"
 
+#ifdef COVERITY
+/*
+ * The hack I use to build for Coverity scanning, using winegcc and
+ * Makefile.cyg, didn't provide some defines in wincrypt.h last time I
+ * looked. Therefore, define them myself here, but enclosed in #ifdef
+ * COVERITY to ensure I don't make up random nonsense values for any
+ * real build.
+ */
+#ifndef CRYPTPROTECTMEMORY_BLOCK_SIZE
+#define CRYPTPROTECTMEMORY_BLOCK_SIZE 16
+#endif
+#ifndef CRYPTPROTECTMEMORY_CROSS_PROCESS
+#define CRYPTPROTECTMEMORY_CROSS_PROCESS 1
+#endif
+#endif
+
 #define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare"
 #define CONNSHARE_MUTEX_PREFIX "Local\\putty-connshare-mutex"