Win32 Fixes for Bugs #67 and #70

bk: 3ed9432d34vf9Wz2juhy8_sIFahE3Q

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index a6bebc45dc28bde12f81baa738ce3f5b9f8a82aa..b3d0238b018bb844c14d151494da019baa4d317b 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -893,7 +893,7 @@ getgroup:
                WaitHandles[2] = get_io_event();
 
                for (;;) {
-                       DWORD Index = WaitForMultipleObjectsEx(sizeof(WaitHandles)/sizeof(WaitHandles[0]), WaitHandles, FALSE, 1000, MWMO_ALERTABLE);
+                       DWORD Index = WaitForMultipleObjectsEx(sizeof(WaitHandles)/sizeof(WaitHandles[0]), WaitHandles, FALSE, 1000, TRUE);
                        switch (Index) {
                                case WAIT_OBJECT_0 + 0 : /* exit request */
                                        exit(0);
@@ -912,30 +912,16 @@ getgroup:
 # endif
                                break;
 
-# if 1
-                               /*
-                                * FIXME: According to the documentation for WaitForMultipleObjectsEx
-                                *        this is not possible. This may be a vestigial from when this was
-                                *        MsgWaitForMultipleObjects, maybe it should be removed?
-                                */
-                               case WAIT_OBJECT_0 + 3 : /* windows message */
-                               {
-                                       MSG msg;
-                                       while ( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) )
-                                       {
-                                               if ( msg.message == WM_QUIT )
-                                               {
-                                                       exit( 0 );
-                                               }
-                                               DispatchMessage( &msg );
-                                       }
-                               }
-                               break;
-# endif
-
                                case WAIT_IO_COMPLETION : /* loop */
                                case WAIT_TIMEOUT :
                                break;
+                               case WAIT_FAILED:
+                                       msyslog(LOG_ERR, "ntpdc: WaitForMultipleObjectsEx Failed: Error: %m");
+                                       break;
+
+                               /* For now do nothing if not expected */
+                               default:
+                                       break;          
                                
                        } /* switch */
                        rbuflist = getrecvbufs();       /* get received buffers */

diff --git a/ports/winnt/ntpd/win32_io.c b/ports/winnt/ntpd/win32_io.c
index 5d7925cddaa125ea2259f809819d5a8600a6aa98..8b3509c70a4c589360da74c03b172fecfbe745b4 100644 (file)
--- a/ports/winnt/ntpd/win32_io.c
+++ b/ports/winnt/ntpd/win32_io.c
@@ -101,7 +101,7 @@ refclock_open(
          case B2400 :  dcb.BaudRate = 2400; break;
          case B4800 :  dcb.BaudRate = 4800; break;
          case B9600 :  dcb.BaudRate = 9600; break;
-         case B19200 : dcb.BaudRate = 9600; break;
+         case B19200 : dcb.BaudRate = 19200; break;
          case B38400 : dcb.BaudRate = 38400; break;
          default :
                msyslog(LOG_ERR, "NT_COM: Device %s: unsupported baud rate", dev);
@@ -187,10 +187,10 @@ tcsetattr(
        switch (max(s->c_ospeed, s->c_ispeed)) {
                case B300 :   dcb.BaudRate = 300; break;
                case B1200 :  dcb.BaudRate = 1200; break;
-               case B2400 :  dcb.BaudRate = 9600; break;
+               case B2400 :  dcb.BaudRate = 2400; break;
                case B4800 :  dcb.BaudRate = 4800; break;
                case B9600 :  dcb.BaudRate = 9600; break;
-               case B19200 : dcb.BaudRate = 9600; break;
+               case B19200 : dcb.BaudRate = 19200; break;
                case B38400 : dcb.BaudRate = 38400; break;
                default :
                        msyslog(LOG_ERR, "NT_COM: unsupported baud rate");