wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Piotr Caban : msvcp100: Add Concurrency::details:: _Concurrent_queue_base_v4 class stub.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 9799de8d2d3fbb04eac8e26691cb5642ea56522b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9799de8d2d3fbb04eac8e266… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:02:31 2018 +0100 msvcp100: Add Concurrency::details::_Concurrent_queue_base_v4 class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 40 ++++----- dlls/msvcp100/msvcp100.spec | 32 +++---- dlls/msvcp110/msvcp110.spec | 60 ++++++------- dlls/msvcp120/msvcp120.spec | 60 ++++++------- dlls/msvcp120_app/msvcp120_app.spec | 60 ++++++------- dlls/msvcp90/misc.c | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 296 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9799de8d2d3fbb04eac8…

1 0

Alex Henrie : dhtmled.ocx: Add dll and stub DHTMLEdit object.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 6c788af6d1c11723838a01333cb112963670591b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c788af6d1c11723838a0133… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 23 16:27:29 2018 +0100 dhtmled.ocx: Add dll and stub DHTMLEdit object. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_private.h | 19 ++ dlls/dhtmled.ocx/dhtmled_tlb.idl | 22 ++ dlls/dhtmled.ocx/edit.c | 534 +++++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 156 +++++++++++ 8 files changed, 746 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c788af6d1c11723838a…

1 0

Jacek Caban : kernel32: Don' t initialize Information of passed OVERLAPPED struct in WriteFile.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 72f3fa9e2dd7afd0f2e41331a9e94febcccce7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f3fa9e2dd7afd0f2e41331… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:52:05 2018 +0100 kernel32: Don't initialize Information of passed OVERLAPPED struct in WriteFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a0cd5f9..7196aff 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -565,8 +565,8 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, piosb = (PIO_STATUS_BLOCK)overlapped; if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } + else piosb->Information = 0; piosb->u.Status = STATUS_PENDING; - piosb->Information = 0; status = NtWriteFile(hFile, hEvent, NULL, cvalue, piosb, buffer, bytesToWrite, poffset, NULL); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e0b8713..22d120f 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -757,6 +757,14 @@ static void test_ReadFile(void) ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.InternalHigh = 0xdeadbeef; + res = WriteFile(server, buf, 1, &size, &overlapped); + ok(!res && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile returned %x(%u)\n", res, GetLastError()); + ok(size == 0, "size = %u\n", size); + ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); + CloseHandle(server); CloseHandle(client); }

1 0

Jacek Caban : kernel32: Always set bytes written in WriteFile.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 84ae4b937ffa5191db834916b8917c03f4cb684c URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ae4b937ffa5191db834916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:51:58 2018 +0100 kernel32: Always set bytes written in WriteFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 86e5431..a0cd5f9 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -577,8 +577,8 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, status = piosb->u.Status; } - if (status != STATUS_PENDING && bytesWritten) - *bytesWritten = piosb->Information; + if (bytesWritten) + *bytesWritten = overlapped && status ? 0 : piosb->Information; if (status && status != STATUS_TIMEOUT) { diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c4beb19..e0b8713 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2767,7 +2767,7 @@ static void _overlapped_write_async(unsigned line, HANDLE writer, void *buf, DWO overlapped->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); res = WriteFile(writer, buf, size, &written_bytes, overlapped); ok_(__FILE__,line)(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %x(%u)\n", res, GetLastError()); - todo_wine ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes); + ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes); _test_not_signaled(line, overlapped->hEvent); }

1 0

Jacek Caban : kernel32: Don' t initialize Information of passed OVERLAPPED struct in ReadFile.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: c47c74e5d3705705ffe7be332e7d17d2b6356923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47c74e5d3705705ffe7be33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:51:50 2018 +0100 kernel32: Don't initialize Information of passed OVERLAPPED struct in ReadFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 45b4365..86e5431 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -442,8 +442,8 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, io_status = (PIO_STATUS_BLOCK)overlapped; if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } + else io_status->Information = 0; io_status->u.Status = STATUS_PENDING; - io_status->Information = 0; status = NtReadFile(hFile, hEvent, NULL, cvalue, io_status, buffer, bytesToRead, poffset, NULL); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 23e7649..c4beb19 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -755,7 +755,6 @@ static void test_ReadFile(void) ok(!res && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile returned %x(%u)\n", res, GetLastError()); ok(size == 0, "size = %u\n", size); ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); - todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); CloseHandle(server); @@ -2628,7 +2627,6 @@ static void test_readfileex_pending(void) ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); -todo_wine ok(overlapped.InternalHigh == -1, "expected -1, got %lu\n", overlapped.InternalHigh); wait = WaitForSingleObject(event, 100);

1 0

Jacek Caban : kernel32: Always set bytes read in ReadFile.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: d5cd34c7df681fc4ab08a9173d9055dce9f7d6f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5cd34c7df681fc4ab08a917… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:51:31 2018 +0100 kernel32: Always set bytes read in ReadFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4766830..45b4365 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -453,8 +453,8 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, status = io_status->u.Status; } - if (status != STATUS_PENDING && bytesRead) - *bytesRead = io_status->Information; + if (bytesRead) + *bytesRead = overlapped && status ? 0 : io_status->Information; if (status == STATUS_END_OF_FILE) { diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 922eed9..23e7649 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -715,6 +715,53 @@ static void test_CreateNamedPipe_instances_must_match(void) ok(CloseHandle(hnp2), "CloseHandle\n"); } +static void test_ReadFile(void) +{ + HANDLE server, client; + OVERLAPPED overlapped; + DWORD size; + BOOL res; + + static char buf[512]; + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + ok(WriteFile(client, buf, sizeof(buf), &size, NULL), "WriteFile\n"); + + res = ReadFile(server, buf, 1, &size, NULL); + ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned %x(%u)\n", res, GetLastError()); + ok(size == 1, "size = %u\n", size); + + /* pass both overlapped and ret read */ + memset(&overlapped, 0, sizeof(overlapped)); + res = ReadFile(server, buf, 1, &size, &overlapped); + ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned %x(%u)\n", res, GetLastError()); + ok(size == 0, "size = %u\n", size); + ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_OVERFLOW, "Internal = %lx\n", overlapped.Internal); + ok(overlapped.InternalHigh == 1, "InternalHigh = %lx\n", overlapped.InternalHigh); + + DisconnectNamedPipe(server); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.InternalHigh = 0xdeadbeef; + res = ReadFile(server, buf, 1, &size, &overlapped); + ok(!res && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile returned %x(%u)\n", res, GetLastError()); + ok(size == 0, "size = %u\n", size); + ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); + todo_wine + ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); + + CloseHandle(server); + CloseHandle(client); +} + /** implementation of alarm() */ static DWORD CALLBACK alarmThreadMain(LPVOID arg) { @@ -2661,7 +2708,7 @@ static void _overlapped_read_sync(unsigned line, HANDLE reader, void *buf, DWORD else ok_(__FILE__,line)(res, "ReadFile failed: %u\n", GetLastError()); if(partial_read) - todo_wine ok_(__FILE__,line)(!read_bytes, "read_bytes %u expected 0\n", read_bytes); + ok_(__FILE__,line)(!read_bytes, "read_bytes %u expected 0\n", read_bytes); else ok_(__FILE__,line)(read_bytes == expected_result, "read_bytes %u expected %u\n", read_bytes, expected_result); @@ -3122,6 +3169,7 @@ START_TEST(pipe) test_CreateNamedPipe(PIPE_TYPE_BYTE); test_CreateNamedPipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); test_CreatePipe(); + test_ReadFile(); test_CloseHandle(); test_impersonation(); test_overlapped();

1 0

Andrew Eikum : advapi32: Implement NotifyServiceStatusChange.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 1f88b90b741b81162b88246206d138549e7cbdbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f88b90b741b81162b882462… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 23 08:37:53 2018 -0600 advapi32: Implement NotifyServiceStatusChange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 146 ++++++++++++++++++++++++++++++++++++------ dlls/advapi32/tests/service.c | 139 ++++++++++++++++++++++++++++++---------- 2 files changed, 232 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f88b90b741b81162b88…

1 0

Andrew Eikum : services: Add support for service status change notifications.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 73e8d0e6a51780dce15fc538acfee1406a79b611 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73e8d0e6a51780dce15fc538… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 23 08:37:10 2018 -0600 services: Add support for service status change notifications. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 224 ++++++++++++++++++++++++++++++++++++++++--- programs/services/services.h | 4 + 2 files changed, 215 insertions(+), 13 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 20c5a27..7c3fa1e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -59,7 +59,8 @@ typedef enum { SC_HTYPE_DONT_CARE = 0, SC_HTYPE_MANAGER, - SC_HTYPE_SERVICE + SC_HTYPE_SERVICE, + SC_HTYPE_NOTIFY } SC_HANDLE_TYPE; struct sc_handle @@ -80,6 +81,32 @@ struct sc_service_handle /* service handle */ struct service_entry *service_entry; }; +struct sc_notify_handle +{ + struct sc_handle hdr; + struct sc_service_handle *service; + HANDLE event; + DWORD notify_mask; + LONG ref; + SC_RPC_NOTIFY_PARAMS_LIST *params_list; +}; + +static void sc_notify_retain(struct sc_notify_handle *notify) +{ + InterlockedIncrement(&notify->ref); +} + +static void sc_notify_release(struct sc_notify_handle *notify) +{ + ULONG r = InterlockedDecrement(&notify->ref); + if (r == 0) + { + CloseHandle(notify->event); + HeapFree(GetProcessHeap(), 0, notify->params_list); + HeapFree(GetProcessHeap(), 0, notify); + } +} + struct sc_lock { struct scmdatabase *db; @@ -227,6 +254,15 @@ static DWORD validate_service_handle(SC_RPC_HANDLE handle, DWORD needed_access, return err; } +static DWORD validate_notify_handle(SC_RPC_HANDLE handle, DWORD needed_access, struct sc_notify_handle **notify) +{ + struct sc_handle *hdr; + DWORD err = validate_context_handle(handle, SC_HTYPE_NOTIFY, needed_access, &hdr); + if (err == ERROR_SUCCESS) + *notify = (struct sc_notify_handle *)hdr; + return err; +} + DWORD __cdecl svcctl_OpenSCManagerW( MACHINE_HANDLEW MachineName, /* Note: this parameter is ignored */ LPCWSTR DatabaseName, @@ -274,6 +310,15 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) case SC_HTYPE_SERVICE: { struct sc_service_handle *service = (struct sc_service_handle *)hdr; + service_lock(service->service_entry); + if (service->service_entry->notify && + service->service_entry->notify->service == service) + { + SetEvent(service->service_entry->notify->event); + sc_notify_release(service->service_entry->notify); + service->service_entry->notify = NULL; + } + service_unlock(service->service_entry); release_service(service->service_entry); HeapFree(GetProcessHeap(), 0, service); break; @@ -776,13 +821,42 @@ DWORD __cdecl svcctl_ChangeServiceConfigW( return err; } +static void fill_notify(struct sc_notify_handle *notify) +{ + SC_RPC_NOTIFY_PARAMS_LIST *list; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(SC_RPC_NOTIFY_PARAMS_LIST) + sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)); + if (!list) + return; + + cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); + + cparams->dwNotifyMask = notify->notify_mask; + memcpy(&cparams->ServiceStatus, &notify->service->service_entry->status, + sizeof(SERVICE_STATUS_PROCESS)); + cparams->dwNotificationStatus = ERROR_SUCCESS; + cparams->dwNotificationTriggered = 1 << (cparams->ServiceStatus.dwCurrentState - SERVICE_STOPPED); + cparams->pszServiceNames = NULL; + + list->cElements = 1; + + list->NotifyParamsArray[0].dwInfoLevel = 2; + list->NotifyParamsArray[0].u.params = cparams; + + InterlockedExchangePointer((void**)&notify->params_list, list); + + SetEvent(notify->event); +} + DWORD __cdecl svcctl_SetServiceStatus( SC_RPC_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { struct sc_service_handle *service; struct process_entry *process; - DWORD err; + DWORD err, mask; WINE_TRACE("(%p, %p)\n", hServiceStatus, lpServiceStatus); @@ -807,6 +881,19 @@ DWORD __cdecl svcctl_SetServiceStatus( release_process(process); } + mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); + if (service->service_entry->notify && + (service->service_entry->notify->notify_mask & mask)) + { + struct sc_notify_handle *notify = service->service_entry->notify; + fill_notify(notify); + service->service_entry->notify = NULL; + sc_notify_release(notify); + service->service_entry->status_notified = TRUE; + } + else + service->service_entry->status_notified = FALSE; + service_unlock(service->service_entry); return ERROR_SUCCESS; @@ -1598,31 +1685,142 @@ DWORD __cdecl svcctl_unknown46(void) } DWORD __cdecl svcctl_NotifyServiceStatusChange( - SC_RPC_HANDLE service, + SC_RPC_HANDLE handle, SC_RPC_NOTIFY_PARAMS params, GUID *clientprocessguid, GUID *scmprocessguid, BOOL *createremotequeue, - SC_NOTIFY_RPC_HANDLE *notify) + SC_NOTIFY_RPC_HANDLE *hNotify) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD err, mask; + struct sc_manager_handle *manager = NULL; + struct sc_service_handle *service = NULL; + struct sc_notify_handle *notify; + struct sc_handle *hdr = handle; + + WINE_TRACE("(%p, NotifyMask: 0x%x, %p, %p, %p, %p)\n", handle, + params.u.params->dwNotifyMask, clientprocessguid, scmprocessguid, + createremotequeue, hNotify); + + switch (hdr->type) + { + case SC_HTYPE_SERVICE: + err = validate_service_handle(handle, SERVICE_QUERY_STATUS, &service); + break; + case SC_HTYPE_MANAGER: + err = validate_scm_handle(handle, SC_MANAGER_ENUMERATE_SERVICE, &manager); + break; + default: + err = ERROR_INVALID_HANDLE; + break; + } + + if (err != ERROR_SUCCESS) + return err; + + if (manager) + { + WARN("Need support for service creation/deletion notifications\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + notify = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*notify)); + if (!notify) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + notify->hdr.type = SC_HTYPE_NOTIFY; + notify->hdr.access = 0; + + notify->service = service; + + notify->event = CreateEventW(NULL, TRUE, FALSE, NULL); + + notify->notify_mask = params.u.params->dwNotifyMask; + + service_lock(service->service_entry); + + if (service->service_entry->notify) + { + service_unlock(service->service_entry); + HeapFree(GetProcessHeap(), 0, notify); + return ERROR_ALREADY_REGISTERED; + } + + mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); + if (!service->service_entry->status_notified && + (notify->notify_mask & mask)) + { + fill_notify(notify); + service->service_entry->status_notified = TRUE; + } + else + { + sc_notify_retain(notify); + service->service_entry->notify = notify; + } + + sc_notify_retain(notify); + *hNotify = &notify->hdr; + + service_unlock(service->service_entry); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_GetNotifyResults( - SC_NOTIFY_RPC_HANDLE notify, - SC_RPC_NOTIFY_PARAMS_LIST **params) + SC_NOTIFY_RPC_HANDLE hNotify, + SC_RPC_NOTIFY_PARAMS_LIST **pList) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD err; + struct sc_notify_handle *notify; + + WINE_TRACE("(%p, %p)\n", hNotify, pList); + + if (!pList) + return ERROR_INVALID_PARAMETER; + + *pList = NULL; + + if ((err = validate_notify_handle(hNotify, 0, &notify)) != 0) + return err; + + sc_notify_retain(notify); + /* block until there is a result */ + err = WaitForSingleObject(notify->event, INFINITE); + + if (err != WAIT_OBJECT_0) + { + sc_notify_release(notify); + return err; + } + + *pList = InterlockedExchangePointer((void**)&notify->params_list, NULL); + if (!*pList) + { + sc_notify_release(notify); + return ERROR_REQUEST_ABORTED; + } + + sc_notify_release(notify); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_CloseNotifyHandle( - SC_NOTIFY_RPC_HANDLE *notify, + SC_NOTIFY_RPC_HANDLE *hNotify, BOOL *apc_fired) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + struct sc_notify_handle *notify; + DWORD err; + + WINE_TRACE("(%p, %p)\n", hNotify, apc_fired); + + if ((err = validate_notify_handle(*hNotify, 0, &notify)) != 0) + return err; + + sc_notify_release(notify); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_ControlServiceExA( diff --git a/programs/services/services.h b/programs/services/services.h index cda70e0..fd19ed3 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,6 +45,8 @@ struct process_entry HANDLE overlapped_event; }; +struct sc_notify_handle; + struct service_entry { struct list entry; @@ -63,6 +65,8 @@ struct service_entry BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; + BOOL status_notified; + struct sc_notify_handle *notify; }; extern struct scmdatabase *active_database;

1 0

Nikolay Sivov : comctl32/tests: Enable cGrow field tests for version 6 serialization format.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 7902e43245137a9fb5d89eb058972384f1501ff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7902e43245137a9fb5d89eb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 14:44:21 2018 +0300 comctl32/tests: Enable cGrow field tests for version 6 serialization format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 152 +++++++++++++++++++++++----------------- 1 file changed, 88 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7902e43245137a9fb5d8…

1 0

Nikolay Sivov : comctl32/tests: Add a helper to replace macro.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: f09deaca43a0da3a72169940c29cc47d3083f635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09deaca43a0da3a72169940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 14:44:20 2018 +0300 comctl32/tests: Add a helper to replace macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d72e22a..958c82f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1029,12 +1029,22 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN cleanup_memstream(&stream); } -static void image_list_init(HIMAGELIST himl) +static void image_list_add_bitmap(HIMAGELIST himl, BYTE grey, int i) { - HBITMAP hbm; char comment[16]; - INT n = 1; - DWORD i; + HBITMAP hbm; + int ret; + + sprintf(comment, "%d", i); + hbm = create_bitmap(BMP_CX, BMP_CX, RGB(grey, grey, grey), comment); + ret = pImageList_Add(himl, hbm, NULL); + ok(ret != -1, "Failed to add image to imagelist.\n"); + DeleteObject(hbm); +} + +static void image_list_init(HIMAGELIST himl) +{ + unsigned int i; static const struct test_data { BYTE grey; @@ -1070,18 +1080,11 @@ static void image_list_init(HIMAGELIST himl) check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, ILC_COLOR24, "total 0"); -#define add_bitmap(grey) \ - sprintf(comment, "%d", n++); \ - hbm = create_bitmap(BMP_CX, BMP_CX, RGB((grey),(grey),(grey)), comment); \ - ImageList_Add(himl, hbm, NULL); \ - DeleteObject(hbm); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - add_bitmap(td[i].grey); + image_list_add_bitmap(himl, td[i].grey, i + 1); check_iml_data(himl, td[i].cx, td[i].cy, td[i].cur, td[i].max, td[i].grow, td[i].bpp, td[i].comment); } -#undef add_bitmap } static void test_imagelist_storage(void)

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018