January 2019 - Wine-commits

Jacek Caban : advapi32/tests: Add test using NotifyServiceStatusChange on different handles of the same service.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 9084b9761d7e4088f5aaa9e9aca0e13b033e0c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9084b9761d7e4088f5aaa9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:52:06 2019 +0100 advapi32/tests: Add test using NotifyServiceStatusChange on different handles of the same service. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cc48347..1552791 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2350,7 +2350,7 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); - /* cannot register two notifications */ + /* cannot register two notifications on the same handle */ data.phase = PHASE_STOPPED; data.was_called = FALSE; @@ -2373,13 +2373,29 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == FALSE, "APC should not have been called\n"); + memset(&data2.notify, 0, sizeof(data2.notify)); + data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data2.notify.pfnNotifyCallback = &notify_cb; + data2.notify.pContext = &data; + data2.svc = svc2; + data2.phase = PHASE_STOPPED; + data2.was_called = FALSE; + + /* it's possible to have multiple notifications using different service handles */ + dr = pNotifyServiceStatusChangeW(svc2, SERVICE_NOTIFY_STOPPED, &data2.notify); + todo_wine + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); + /* stop service and receive notifiction */ br = ControlService(svc, SERVICE_CONTROL_STOP, &status); ok(br, "ControlService failed: %u\n", GetLastError()); dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + dr2 = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION || dr2 == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); + todo_wine + ok(data2.was_called == TRUE, "APC wasn't called\n"); /* test cancelation: create notify on svc that will block until service * start; close svc; start service on svc2; verify that notification does

1 0

Jacek Caban : services: Store a list of service handles in service_entry.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: ac3f571e56bc31b7b23686fc19cc804133769a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3f571e56bc31b7b23686fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:52:24 2019 +0100 services: Store a list of service handles in service_entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 6 ++++++ programs/services/services.c | 3 +++ programs/services/services.h | 1 + 3 files changed, 10 insertions(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index efbcd76..623e1fa 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -78,6 +78,7 @@ struct sc_manager_handle /* service control manager handle */ struct sc_service_handle /* service handle */ { struct sc_handle hdr; + struct list entry; struct service_entry *service_entry; }; @@ -311,6 +312,7 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) { struct sc_service_handle *service = (struct sc_service_handle *)hdr; service_lock(service->service_entry); + list_remove(&service->entry); if (service->service_entry->notify && service->service_entry->notify->service == service) { @@ -431,7 +433,11 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); + + service_lock(entry); service->service_entry = entry; + list_add_tail(&entry->handles, &service->entry); + service_unlock(entry); *phService = &service->hdr; return ERROR_SUCCESS; diff --git a/programs/services/services.c b/programs/services/services.c index 3de46bd..fe605ac 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <stdarg.h> +#include <assert.h> #include <windows.h> #include <winsvc.h> #include <rpc.h> @@ -114,6 +115,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) if (!*entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; (*entry)->name = strdupW(name); + list_init(&(*entry)->handles); if (!(*entry)->name) { HeapFree(GetProcessHeap(), 0, *entry); @@ -136,6 +138,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) void free_service_entry(struct service_entry *entry) { + assert(list_empty(&entry->handles)); CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry->name); HeapFree(GetProcessHeap(), 0, entry->config.lpBinaryPathName); diff --git a/programs/services/services.h b/programs/services/services.h index 5a79c35..c78f71c 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -67,6 +67,7 @@ struct service_entry BOOL is_wow64; BOOL status_notified; struct sc_notify_handle *notify; + struct list handles; }; extern struct scmdatabase *active_database;

1 0

Jacek Caban : services: Associate notify handle with service handle instead of service entry.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 8a2347baffb64f6d2b2901e5a87c926e498671d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2347baffb64f6d2b2901e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:54:00 2019 +0100 services: Associate notify handle with service handle instead of service entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 -- programs/services/rpc.c | 68 +++++++++++++++++++++---------------------- programs/services/services.h | 4 --- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 1552791..e4ff7d7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2383,7 +2383,6 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) /* it's possible to have multiple notifications using different service handles */ dr = pNotifyServiceStatusChangeW(svc2, SERVICE_NOTIFY_STOPPED, &data2.notify); - todo_wine ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); /* stop service and receive notifiction */ @@ -2394,7 +2393,6 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) dr2 = SleepEx(100, TRUE); ok(dr == WAIT_IO_COMPLETION || dr2 == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); - todo_wine ok(data2.was_called == TRUE, "APC wasn't called\n"); /* test cancelation: create notify on svc that will block until service diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 623e1fa..8299dbf 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -75,23 +75,24 @@ struct sc_manager_handle /* service control manager handle */ struct scmdatabase *db; }; -struct sc_service_handle /* service handle */ -{ - struct sc_handle hdr; - struct list entry; - 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; }; +struct sc_service_handle /* service handle */ +{ + struct sc_handle hdr; + struct list entry; + BOOL status_notified; + struct service_entry *service_entry; + struct sc_notify_handle *notify; +}; + static void sc_notify_retain(struct sc_notify_handle *notify) { InterlockedIncrement(&notify->ref); @@ -313,12 +314,10 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) struct sc_service_handle *service = (struct sc_service_handle *)hdr; service_lock(service->service_entry); list_remove(&service->entry); - if (service->service_entry->notify && - service->service_entry->notify->service == service) + if (service->notify) { - SetEvent(service->service_entry->notify->event); - sc_notify_release(service->service_entry->notify); - service->service_entry->notify = NULL; + SetEvent(service->notify->event); + sc_notify_release(service->notify); } service_unlock(service->service_entry); release_service(service->service_entry); @@ -432,6 +431,8 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; + service->notify = NULL; + service->status_notified = FALSE; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); service_lock(entry); @@ -835,7 +836,7 @@ static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_e status->dwServiceFlags = 0; } -static void fill_notify(struct sc_notify_handle *notify) +static void fill_notify(struct sc_notify_handle *notify, struct service_entry *service) { SC_RPC_NOTIFY_PARAMS_LIST *list; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; @@ -848,7 +849,7 @@ static void fill_notify(struct sc_notify_handle *notify) cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); cparams->dwNotifyMask = notify->notify_mask; - fill_status_process(&cparams->ServiceStatus, notify->service->service_entry); + fill_status_process(&cparams->ServiceStatus, service); cparams->dwNotificationStatus = ERROR_SUCCESS; cparams->dwNotificationTriggered = 1 << (cparams->ServiceStatus.dwCurrentState - SERVICE_STOPPED); cparams->pszServiceNames = NULL; @@ -867,7 +868,7 @@ DWORD __cdecl svcctl_SetServiceStatus( SC_RPC_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { - struct sc_service_handle *service; + struct sc_service_handle *service, *service_handle; struct process_entry *process; DWORD err, mask; @@ -895,17 +896,19 @@ DWORD __cdecl svcctl_SetServiceStatus( } mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); - if (service->service_entry->notify && - (service->service_entry->notify->notify_mask & mask)) + LIST_FOR_EACH_ENTRY(service_handle, &service->service_entry->handles, struct sc_service_handle, entry) { - 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; + struct sc_notify_handle *notify = service_handle->notify; + if (notify && (notify->notify_mask & mask)) + { + fill_notify(notify, service->service_entry); + sc_notify_release(notify); + service_handle->notify = NULL; + service_handle->status_notified = TRUE; + } + else + service_handle->status_notified = FALSE; } - else - service->service_entry->status_notified = FALSE; service_unlock(service->service_entry); @@ -1736,32 +1739,29 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( 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) + if (service->notify) { service_unlock(service->service_entry); - HeapFree(GetProcessHeap(), 0, notify); + sc_notify_release(notify); return ERROR_ALREADY_REGISTERED; } mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); - if (!service->service_entry->status_notified && - (notify->notify_mask & mask)) + if (!service->status_notified && (notify->notify_mask & mask)) { - fill_notify(notify); - service->service_entry->status_notified = TRUE; + fill_notify(notify, service->service_entry); + service->status_notified = TRUE; } else { sc_notify_retain(notify); - service->service_entry->notify = notify; + service->notify = notify; } sc_notify_retain(notify); diff --git a/programs/services/services.h b/programs/services/services.h index c78f71c..e1481d9 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,8 +45,6 @@ struct process_entry HANDLE overlapped_event; }; -struct sc_notify_handle; - struct service_entry { struct list entry; @@ -65,8 +63,6 @@ struct service_entry BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; - BOOL status_notified; - struct sc_notify_handle *notify; struct list handles; };

1 0

Dmitry Timoshkov : wininet: Make GetUrlCacheConfigInfo() return actual dwQuota and dwCacheSize.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: ca29ac4650f7f9a96cfaa75a7919ef007306cbbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca29ac4650f7f9a96cfaa75a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 28 09:49:09 2019 +0800 wininet: Make GetUrlCacheConfigInfo() return actual dwQuota and dwCacheSize. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 71 ++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4d422c9..4971fcd 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3762,33 +3762,10 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, return FALSE; } -/*********************************************************************** - * GetUrlCacheConfigInfoW (WININET.@) - */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) +static cache_container *find_container(DWORD flags) { cache_container *container; - FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); - - if (!info) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - info->dwContainer = 0; - info->dwQuota = 0x3e800; /* FIXME */ - info->dwReserved4 = 0; - info->fPerUser = TRUE; - info->dwSyncMode = 0; - info->dwNumCachePaths = 1; - info->dwNormalUsage = 0; - info->dwExemptUsage = 0; - - info->u.s.CachePath[0] = 0; - info->u.s.dwCacheSize = 0x3e800; /* FIXME */ - LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) @@ -3796,17 +3773,17 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s case 0: case CACHE_CONFIG_CONTENT_PATHS_FC: if (container->default_entry_type == NORMAL_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; case CACHE_CONFIG_COOKIES_PATHS_FC: if (container->default_entry_type == COOKIE_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; case CACHE_CONFIG_HISTORY_PATHS_FC: if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; default: @@ -3815,6 +3792,45 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s } } + return NULL; +} + +/*********************************************************************** + * GetUrlCacheConfigInfoW (WININET.@) + */ +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) +{ + cache_container *container; + DWORD error; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info || !(container = find_container(flags))) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + error = cache_container_open_index(container, MIN_BLOCK_NO); + if (error != ERROR_SUCCESS) + { + INTERNET_SetLastError(error); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = FILE_SIZE(MAX_BLOCK_NO) / 1024; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + info->u.s.dwCacheSize = container->file_size / 1024; + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + + cache_container_close_index(container); + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); return TRUE; @@ -3847,7 +3863,6 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s info->dwNumCachePaths = infoW.dwNumCachePaths; info->dwNormalUsage = infoW.dwNormalUsage; info->dwExemptUsage = infoW.dwExemptUsage; - info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL);

1 0

Gijs Vermeulen : msvcp: Return ERROR_INVALID_PARAMETER on NULL input in _Copy_file.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: e978b3aa84b1d8d411e27d8d77f2e8e6b499e45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e978b3aa84b1d8d411e27d8d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Jan 26 22:17:55 2019 +0100 msvcp: Return ERROR_INVALID_PARAMETER on NULL input in _Copy_file. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 28 +++++++++++++--------------- dlls/msvcp90/ios.c | 3 +++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 534c015..70fc0c1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1426,19 +1426,18 @@ static void test_tr2_sys__Copy_file(void) MSVCP_bool fail_if_exists; int last_error; int last_error2; - MSVCP_bool is_todo; } tests[] = { - { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS, FALSE } + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS }, + { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS } }; ret = p_tr2_sys__Make_dir("tr2_test_dir"); @@ -1453,9 +1452,8 @@ static void test_tr2_sys__Copy_file(void) for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); - todo_wine_if(tests[i].is_todo) - ok(ret == tests[i].last_error || ret == tests[i].last_error2, - "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 743e4ca..7f792d6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14767,6 +14767,9 @@ int __cdecl tr2_sys__Copy_file(char const* source, char const* dest, MSVCP_bool { TRACE("(%s %s %x)\n", debugstr_a(source), debugstr_a(dest), fail_if_exists); + if(!source || !dest) + return ERROR_INVALID_PARAMETER; + if(CopyFileA(source, dest, fail_if_exists)) return ERROR_SUCCESS; return GetLastError();

1 0

Nikolay Sivov : ole32: Implement chained IInitializeSpy support.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 645a1f8c5a3a91ddc1704acdacca1365ea092b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=645a1f8c5a3a91ddc1704acd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 07:07:52 2019 +0300 ole32: Implement chained IInitializeSpy support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 111 +++++++++++++++++++++++++++++++++---------- dlls/ole32/compobj_private.h | 17 ++++++- dlls/ole32/tests/compobj.c | 15 ++---- 3 files changed, 105 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=645a1f8c5a3a91ddc170…

1 0

Nikolay Sivov : ole32/tests: Test flags passed to spy methods.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: fbe23bdd99b7fce480a51f86754f515da8e3c870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe23bdd99b7fce480a51f86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 07:07:53 2019 +0300 ole32/tests: Test flags passed to spy methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4c51ee6..b4dd83e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3308,14 +3308,14 @@ static ULONG WINAPI testinitialize_Release(IInitializeSpy *iface) static HRESULT WINAPI testinitialize_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(coinit == (COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE), "Unexpected init flags %#x.\n", coinit); + return S_OK; } static HRESULT WINAPI testinitialize_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(coinit == (COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE), "Unexpected init flags %#x.\n", coinit); + return hr; } static HRESULT WINAPI testinitialize_PreUninitialize(IInitializeSpy *iface, DWORD aptrefs) @@ -3398,6 +3398,9 @@ static void test_IInitializeSpy(void) GetCurrentThreadId()); ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + hr = CoRevokeInitializeSpy(cookie); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3406,6 +3409,8 @@ static void test_IInitializeSpy(void) hr = CoRevokeInitializeSpy(cookie2); ok(hr == S_OK, "got 0x%08x\n", hr); + + CoUninitialize(); } static HRESULT g_persistfile_qi_ret;

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeReleaseSpinLockFromDpcLevel().
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: a1dfdfaf22c24524f26dad720fceaf421ec6bb78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dfdfaf22c24524f26dad72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:31 2019 -0600 ntoskrnl.exe: Implement KeReleaseSpinLockFromDpcLevel(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 11 ++++++++++- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bf87504..47ce683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -594,7 +594,7 @@ @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) @ stdcall -arch=arm,arm64,x86_64 KeReleaseSpinLock(ptr long) -@ stub KeReleaseSpinLockFromDpcLevel +@ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy @ stub KeRemoveDeviceQueue diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 475fcf1..b439695 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -386,7 +386,6 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) *lock = 0; } -#ifndef __i386__ static inline void small_pause(void) { #ifdef __x86_64__ @@ -397,6 +396,16 @@ static inline void small_pause(void) } /*********************************************************************** + * KeReleaseSpinLockFromDpcLevel (NTOSKRNL.EXE.@) + */ +void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + InterlockedExchangePointer( (void **)lock, 0 ); +} + +#ifndef __i386__ +/*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) */ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a53c7a2..25d7da8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1443,6 +1443,7 @@ ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); +void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY);

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeAcquireSpinLockAtDpcLevel().
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: da4291dfc535052a6d802ca6a374198104b1426c URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4291dfc535052a6d802ca6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:32 2019 -0600 ntoskrnl.exe: Implement KeAcquireSpinLockAtDpcLevel(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 10 ++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 47ce683..52ffc3d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -510,7 +510,7 @@ @ stub Ke386QueryIoAccessMap @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock -@ stub KeAcquireSpinLockAtDpcLevel +@ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index b439695..31a3ad7 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -396,6 +396,16 @@ static inline void small_pause(void) } /*********************************************************************** + * KeAcquireSpinLockAtDpcLevel (NTOSKRNL.EXE.@) + */ +void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + small_pause(); +} + +/*********************************************************************** * KeReleaseSpinLockFromDpcLevel (NTOSKRNL.EXE.@) */ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 25d7da8..ca2aa9d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1427,6 +1427,7 @@ void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); #define KeAcquireSpinLock( lock, irql ) *(irql) = KeAcquireSpinLockRaiseToDpc( lock ) KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK*); #endif +void WINAPI KeAcquireSpinLockAtDpcLevel(KSPIN_LOCK*); BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement plain spinlock functions on top of DPC-level ones.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 05f5cce6c8b8bf527f1c15ee0f87c27370b301eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f5cce6c8b8bf527f1c15ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:33 2019 -0600 ntoskrnl.exe: Implement plain spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 31a3ad7..2a4685c 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -421,7 +421,7 @@ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { TRACE("lock %p, irql %u.\n", lock, irql); - InterlockedExchangePointer( (void **)lock, 0 ); + KeReleaseSpinLockFromDpcLevel( lock ); } /*********************************************************************** @@ -430,8 +430,7 @@ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + KeAcquireSpinLockAtDpcLevel( lock ); return 0; } #endif

1 0