[svn] w32pth - r43 - trunk

[svn author wk]

Author: wk
Date: 2010-08-06 12:25:50 +0200 (Fri, 06 Aug 2010)
New Revision: 43

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/w32-pth.c
Log:
Fix regression


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-02 18:32:36 UTC (rev 42)
+++ trunk/ChangeLog	2010-08-06 10:25:50 UTC (rev 43)
@@ -1,3 +1,8 @@
+2010-08-06  Werner Koch  <wk at g10code.com>
+
+	* w32-pth.c (set_timer): Fix timer setting on plain windows.
+	Fixes regression introduced on 2010-02-25.
+
 2010-08-02  Werner Koch  <wk at g10code.com>
 
 	Release 2.0.4.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-08-02 18:32:36 UTC (rev 42)
+++ trunk/NEWS	2010-08-06 10:25:50 UTC (rev 43)
@@ -1,3 +1,9 @@
+Noteworthy changes in version 2.0.5
+------------------------------------------------
+
+ * Fix regression in W32 timer handling introduced by 2.0.3.
+
+
 Noteworthy changes in version 2.0.4 (2010-08-02) 
 ------------------------------------------------
 

Modified: trunk/w32-pth.c
===================================================================
--- trunk/w32-pth.c	2010-08-02 18:32:36 UTC (rev 42)
+++ trunk/w32-pth.c	2010-08-06 10:25:50 UTC (rev 43)
@@ -688,8 +688,12 @@
 #else /* Plain Windows.  */
   LARGE_INTEGER ll;
   char strerr[256];
+
+  if (DBG_CALLS)
+    _pth_debug (DEBUG_CALLS, "set_timer hd=%p ms=%lu\n", 
+                hd, (unsigned long)milliseconds);
   
-  ll.QuadPart = - (milliseconds * 10000);
+  ll.QuadPart = ((unsigned long)milliseconds * ((long long)-10000LL));
   if (!SetWaitableTimer (hd, &ll, 0, NULL, NULL, FALSE))
     {
       if (DBG_ERROR)