January 2018 - Wine-Commits

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4 constructor implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 8d9c48171cf1ad83e92ac93d2b6abcbffd683786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d9c48171cf1ad83e92ac93d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:03:00 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4 constructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7fd041..ac6de38 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1234,6 +1234,8 @@ typedef struct MSVCP_size_t item_size; } _Concurrent_queue_base_v4; +extern const vtable_ptr MSVCP__Concurrent_queue_base_v4_vtable; + /* ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ */ /* ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_throw_exception, 4) @@ -1250,8 +1252,22 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_ctor, 8) _Concurrent_queue_base_v4* __thiscall _Concurrent_queue_base_v4_ctor( _Concurrent_queue_base_v4 *this, MSVCP_size_t size) { - FIXME("(%p %ld) stub\n", this, size); - return NULL; + TRACE("(%p %ld)\n", this, size); + + this->data = MSVCRT_operator_new(sizeof(*this->data)); + memset(this->data, 0, sizeof(*this->data)); + + this->vtable = &MSVCP__Concurrent_queue_base_v4_vtable; + this->item_size = size; + + /* alloc_count needs to be power of 2 */ + this->alloc_count = + size <= 8 ? 32 : + size <= 16 ? 16 : + size <= 32 ? 8 : + size <= 64 ? 4 : + size <= 128 ? 2 : 1; + return this; } /* ??1_Concurrent_queue_base_v4(a)details@Concurrency@@MAE(a)XZ */

1 0

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

Jan. 23, 2018

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

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

Jan. 23, 2018

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 Jan. 23, 2018

Jan. 23, 2018

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 Jan. 23, 2018

Jan. 23, 2018

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 Jan. 23, 2018

Jan. 23, 2018

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: Link to activation context API directly.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 08a68a9fbefe1749e3446adcf221c3ea7374aac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a68a9fbefe1749e3446adc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 14:44:18 2018 +0300 comctl32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 10 ++-------- dlls/comctl32/tests/v6util.h | 43 +++++++------------------------------------ 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 41cf165..441ca58 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -54,20 +54,14 @@ struct wndclass_redirect_data /* returned pointer is valid as long as activation context is alive */ static WCHAR* get_versioned_classname(const WCHAR *name) { - BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); struct wndclass_redirect_data *wnddata; ACTCTX_SECTION_KEYED_DATA data; BOOL ret; - pFindActCtxSectionStringW = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "FindActCtxSectionStringW"); - memset(&data, 0, sizeof(data)); data.cbSize = sizeof(data); - - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - name, &data); - ok(ret, "got %d, error %u\n", ret, GetLastError()); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data); + ok(ret, "Failed to find class redirection section, error %u\n", GetLastError()); wnddata = (struct wndclass_redirect_data*)data.lpData; return (WCHAR*)((BYTE*)wnddata + wnddata->name_offset); } diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 9f5a9c4..afdc12c 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -62,48 +62,19 @@ static const CHAR manifest[] = static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) { - HANDLE hKernel32; - BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); - VOID (WINAPI *pReleaseActCtx)(HANDLE); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - pReleaseActCtx = (void*)GetProcAddress(hKernel32, "ReleaseActCtx"); - if (!pDeactivateActCtx || !pReleaseActCtx) - { - win_skip("Activation contexts unsupported\n"); - return; - } - - pDeactivateActCtx(0, cookie); - pReleaseActCtx(hCtx); + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); DeleteFileA(manifest_name); } static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { - HANDLE hKernel32; - HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); - BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); - BOOL (WINAPI *pFindActCtxSectionStringA)(DWORD,const GUID *,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA); - ACTCTX_SECTION_KEYED_DATA data; - + DWORD written; ACTCTXA ctx; - BOOL ret; HANDLE file; - DWORD written; - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); - pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); - pFindActCtxSectionStringA = (void*)GetProcAddress(hKernel32, "FindActCtxSectionStringA"); - if (!(pCreateActCtxA && pActivateActCtx)) - { - win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); - return FALSE; - } + BOOL ret; /* create manifest */ file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); @@ -131,10 +102,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) ctx.cbSize = sizeof(ctx); ctx.lpSource = manifest_name; - *hCtx = pCreateActCtxA(&ctx); + *hCtx = CreateActCtxA(&ctx); ok(*hCtx != 0, "Expected context handle\n"); - ret = pActivateActCtx(*hCtx, pcookie); + ret = ActivateActCtx(*hCtx, pcookie); expect(TRUE, ret); if (!ret) @@ -144,7 +115,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) } data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "comctl32.dll", &data); ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); if (ret)

1 0

Piotr Caban : msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 2149f472eac3408334ce0a372ef170adbc2b9996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2149f472eac3408334ce0a37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:04:24 2018 +0100 msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 211 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 198 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2149f472eac3408334ce…

1 0

Piotr Caban : msvcp120: Add _Concurrent_queue_base_v4 tests.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 33ba5e296b74a0f22b776034d87faa212e638e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ba5e296b74a0f22b776034… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:04:17 2018 +0100 msvcp120: Add _Concurrent_queue_base_v4 tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 261 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ba5e296b74a0f22b77…

1 0

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4:: _Internal_size implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 1a00d8dd71eadabfbe5bc9e8c0c753f0dfa62b8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a00d8dd71eadabfbe5bc9e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:03:40 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4::_Internal_size implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 32d9e29..ca85079 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1330,8 +1330,8 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_empty, 4) MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_empty( const _Concurrent_queue_base_v4 *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->data->head_pos == this->data->tail_pos; } /* ?_Internal_size(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEIXZ */ @@ -1340,8 +1340,8 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_size, 4) MSVCP_size_t __thiscall _Concurrent_queue_base_v4__Internal_size( const _Concurrent_queue_base_v4 *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->data->tail_pos - this->data->head_pos; } /* ?_Internal_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXPBX(a)Z */

1 0