WIN32 compilation error fixes.

[silc.git] / lib / silcutil / win32 / silcwin32schedule.c

diff --git a/lib/silcutil/win32/silcwin32schedule.c b/lib/silcutil/win32/silcwin32schedule.c
index f4a263fcbd4d712df36479066f893c75b401b568..f8ee3be7a904e584a0659050332bc7adc8ce8748 100644 (file)
--- a/lib/silcutil/win32/silcwin32schedule.c
+++ b/lib/silcutil/win32/silcwin32schedule.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2006 Pekka Riikonen
+  Copyright (C) 2001 - 2007 Pekka Riikonen
 
   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
@@ -20,6 +20,8 @@
 
 #include "silc.h"
 
+const SilcScheduleOps schedule_ops;
+
 /* Our "select()" for WIN32. This mimics the behaviour of select() system
    call. It does not call the Winsock's select() though. Its functions
    are derived from GLib's g_poll() and from some old Xemacs's sys_select().
@@ -48,15 +50,16 @@
 
 */
 
-int silc_select(SilcSchedule schedule, void *context);
+int silc_select(SilcSchedule schedule, void *context)
 {
   SilcHashTableList htl;
   SilcTaskFd task;
   HANDLE handles[MAXIMUM_WAIT_OBJECTS];
   DWORD ready, curtime;
   LONG timeo;
+  UINT timer;
   MSG msg;
-  int nhandles = 0, i, fd;
+  int nhandles = 0, fd;
 
   silc_hash_table_list(schedule->fd_queue, &htl);
   while (silc_hash_table_get(&htl, (void **)&fd, (void **)&task)) {
@@ -77,6 +80,7 @@ int silc_select(SilcSchedule schedule, void *context);
     task->revents = 0;
   }
   silc_hash_table_list_reset(&htl);
+  silc_list_init(schedule->fd_dispatch, struct SilcTaskStruct, next);
 
   timeo = (schedule->has_timeout ? ((schedule->timeout.tv_sec * 1000) +
                                    (schedule->timeout.tv_usec / 1000))
@@ -86,7 +90,7 @@ int silc_select(SilcSchedule schedule, void *context);
      and wait just for windows messages. */
   if (nhandles == 0 && schedule->has_timeout) {
     SILC_SCHEDULE_UNLOCK(schedule);
-    UINT timer = SetTimer(NULL, 0, timeo, NULL);
+    timer = SetTimer(NULL, 0, timeo, NULL);
     curtime = GetTickCount();
     while (timer) {
       WaitMessage();
@@ -153,7 +157,7 @@ int silc_select(SilcSchedule schedule, void *context);
     }
 
     /* Give the wait another try */
-   goto retry;
+    goto retry;
   } else if (ready >= WAIT_OBJECT_0 && ready < WAIT_OBJECT_0 + nhandles) {
     /* Some other event, like SOCKET or something. */
 
@@ -162,19 +166,15 @@ int silc_select(SilcSchedule schedule, void *context);
     nhandles = silc_hash_table_count(schedule->fd_queue);
     ready -= WAIT_OBJECT_0;
     do {
-      i = 0;
-      silc_hash_table_list(schedule->fd_queue, &htl);
-      while (silc_hash_table_get(&htl, (void **)&fd, (void **)&task)) {
-       if (!task->events)
-         continue;
-
-       if (fd == (int)handles[ready]) {
-         i++;
-         task->revents |= SILC_TASK_READ;
-         break;
-       }
+      if (!silc_hash_table_find(schedule->fd_queue,
+                               SILC_32_TO_PTR((SilcUInt32)handles[ready]),
+                               NULL, (void *)&task))
+       break;
+
+      if (task->header.valid && task->events) {
+       task->revents |= SILC_TASK_READ;
+       silc_list_add(schedule->fd_dispatch, task);
       }
-      silc_hash_table_list_reset(&htl);
 
       /* Check the status of the next handle and set its fd to the fd
         set if data is available. */
@@ -185,7 +185,7 @@ int silc_select(SilcSchedule schedule, void *context);
       SILC_SCHEDULE_LOCK(schedule);
     } while (ready < nhandles);
 
-    return i + 1;
+    return silc_list_count(schedule->fd_dispatch);
   }
 
   return -1;
@@ -242,7 +242,7 @@ void *silc_schedule_internal_init(SilcSchedule schedule, void *app_context)
 
   return (void *)wakeup;
 #else
-  return NULL;
+  return (void *)1;
 #endif
 }
 
@@ -261,6 +261,16 @@ void silc_schedule_internal_uninit(SilcSchedule schedule, void *context)
 #endif
 }
 
+/* Schedule `task' with events `event_mask'. Zero `event_mask' unschedules. */
+
+SilcBool silc_schedule_internal_schedule_fd(SilcSchedule schedule,
+                                           void *context,
+                                           SilcTaskFd task,
+                                           SilcTaskEvent event_mask)
+{
+  return TRUE;
+}
+
 /* Wakes up the scheduler */
 
 void silc_schedule_internal_wakeup(SilcSchedule schedule, void *context)
@@ -298,8 +308,7 @@ void silc_schedule_internal_signal_unregister(SilcSchedule schedule,
 /* Call all signals */
 
 void silc_schedule_internal_signals_call(SilcSchedule schedule,
-                                        void *context,
-                                         SilcSchedule schedule)
+                                        void *context)
 {
 
 }
@@ -325,6 +334,7 @@ const SilcScheduleOps schedule_ops =
   silc_schedule_internal_init,
   silc_schedule_internal_uninit,
   silc_select,
+  silc_schedule_internal_schedule_fd,
   silc_schedule_internal_wakeup,
   silc_schedule_internal_signal_register,
   silc_schedule_internal_signal_unregister,