From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 20 Jun 2012 21:30:48 +0000 (+0200)
Subject: tmpfile, clean-temp: Fix invocation of GetVersionEx.
X-Git-Tag: v0.1~606
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ebc6ce40ac3f349d69766e3b94db034a0245f3d7;p=gnulib.git

tmpfile, clean-temp: Fix invocation of GetVersionEx.

* lib/tmpfile.c (supports_delete_on_close): Initialize parameter for
GetVersionEx correctly.
* lib/clean-temp.c (supports_delete_on_close): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 34bcd6db5..199b06cda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-20  John Darrington  <john@darrington.wattle.id.au>  (tiny change)
+
+	tmpfile, clean-temp: Fix invocation of GetVersionEx.
+	* lib/tmpfile.c (supports_delete_on_close): Initialize parameter for
+	GetVersionEx correctly.
+	* lib/clean-temp.c (supports_delete_on_close): Likewise.
+
 2012-06-20  Bruno Haible  <bruno@clisp.org>
 
 	fdopen: Allow implementations that don't reject invalid fd arguments.
diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index b05550a43..ef926e52d 100644
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -583,6 +583,11 @@ supports_delete_on_close ()
     {
       OSVERSIONINFO v;
 
+      /* According to
+         <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
+         this structure must be initialised as follows:  */
+      v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+
       if (GetVersionEx (&v))
         known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else
diff --git a/lib/tmpfile.c b/lib/tmpfile.c
index 824952520..2362a6536 100644
--- a/lib/tmpfile.c
+++ b/lib/tmpfile.c
@@ -54,6 +54,11 @@ supports_delete_on_close ()
     {
       OSVERSIONINFO v;
 
+      /* According to
+         <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
+         this structure must be initialised as follows:  */
+      v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+
       if (GetVersionEx (&v))
         known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else