ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

schedsvc: Only restart the directory watch once we've received data. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-06-26 13:09:13 +02:00
parent 5bd1b6f410
commit 6a1ce3c114
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/schedsvc/svc_main.c
View File

@ -47,9 +47,17 @@ static DWORD WINAPI tasks_monitor_thread(void *arg)
static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 };
WCHAR path[MAX_PATH];
HANDLE htasks, hport, htimer;
JOBOBJECT_ASSOCIATE_COMPLETION_PORT info;
JOBOBJECT_ASSOCIATE_COMPLETION_PORT job_info;
OVERLAPPED ov;
LARGE_INTEGER period;
struct
{
FILE_NOTIFY_INFORMATION data;
WCHAR name_buffer[MAX_PATH];
} info;
/* the buffer must be DWORD aligned */
C_ASSERT(!(sizeof(info) & 3));
TRACE("Starting...\n");
@ -91,9 +99,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg)
return -1;
}
info.CompletionKey = hjob_queue;
info.CompletionPort = hport;
if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info)))
job_info.CompletionKey = hjob_queue;
job_info.CompletionPort = hport;
if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &job_info, sizeof(job_info)))
{
ERR("SetInformationJobObject failed\n");
return -1;
@ -102,29 +110,16 @@ static DWORD WINAPI tasks_monitor_thread(void *arg)
memset(&ov, 0, sizeof(ov));
ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
memset(&info, 0, sizeof(info));
ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE,
NULL, &ov, NULL);
for (;;)
{
struct
{
FILE_NOTIFY_INFORMATION data;
WCHAR name_buffer[MAX_PATH];
} info;
HANDLE events[4];
DWORD ret;
/* the buffer must be DWORD aligned */
C_ASSERT(!(sizeof(info) & 3));
memset(&info, 0, sizeof(info));
ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE,
NULL, &ov, NULL);
if (!ret) break;
if (info.data.NextEntryOffset)
FIXME("got multiple entries\n");
events[0] = done_event;
events[1] = htimer;
events[2] = hport;
@ -160,6 +155,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg)
continue;
}
if (info.data.NextEntryOffset)
FIXME("got multiple entries\n");
/* Directory change notification */
info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0;
@ -204,6 +202,11 @@ static DWORD WINAPI tasks_monitor_thread(void *arg)
if (!SetWaitableTimer(htimer, &period, 0, NULL, NULL, FALSE))
ERR("SetWaitableTimer failed\n");
}
memset(&info, 0, sizeof(info));
if (!ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE,
NULL, &ov, NULL)) break;
}
CancelWaitableTimer(htimer);