Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / libcaptive / ex / work.c

diff --git a/src/libcaptive/ex/work.c b/src/libcaptive/ex/work.c
index c591c8f..3094f61 100644 (file)
--- a/src/libcaptive/ex/work.c
+++ b/src/libcaptive/ex/work.c
@@ -29,11 +29,12 @@
 static gboolean ExQueueWorkItem_idlefunc(WORK_QUEUE_ITEM *WorkItem_copy /* data */)
 {
        g_return_val_if_fail(WorkItem_copy!=NULL,FALSE);        /* false=>remove-me */
-       g_return_val_if_fail(WorkItem_copy->Routine!=NULL,FALSE);       /* false=>remove-me */
+       g_return_val_if_fail(WorkItem_copy->WorkerRoutine!=NULL,FALSE); /* false=>remove-me */
 
        /* typedef VOID STDCALL_FUNC (*PWORKER_THREAD_ROUTINE)(PVOID Parameter); */
 
-       (*WorkItem_copy->Routine)(WorkItem_copy->Context);
+       captive_stdcall_call_4((CaptiveStdCallFunc4)WorkItem_copy->WorkerRoutine,
+                       WorkItem_copy->Parameter);      /* Parameter */
        g_free(WorkItem_copy);
 
        return FALSE;   /* remove-me */
@@ -58,7 +59,7 @@ gint priority;
 WORK_QUEUE_ITEM *WorkItem_copy;
 
        g_return_if_fail(WorkItem!=NULL);
-       g_return_if_fail(WorkItem->Routine!=NULL);
+       g_return_if_fail(WorkItem->WorkerRoutine!=NULL);
 
        switch (QueueType) {
                case DelayedWorkQueue: