March 2017 - Wine-Commits - list.winehq.org

Huw Davies : user32: Simplify GetMenuItemRect().
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: d4d0247f4e3f4ddbcc7857d8c279e45b1107070b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d0247f4e3f4ddbcc7857d8c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:20 2017 +0100 user32: Simplify GetMenuItemRect(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6584a41..3c1bb3e 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5105,35 +5105,26 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, * always on the upper left side of the application. * */ -BOOL WINAPI GetMenuItemRect (HWND hwnd, HMENU hMenu, UINT uItem, - LPRECT rect) +BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { - POPUPMENU *itemMenu; + POPUPMENU *menu; MENUITEM *item; - HWND referenceHwnd; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); - referenceHwnd = hwnd; - - if(!hwnd) - { - itemMenu = MENU_GetMenu(hMenu); - if (itemMenu == NULL) - return FALSE; + if ((rect == NULL) || (item == NULL)) + return FALSE; - if(itemMenu->hWnd == 0) - return FALSE; - referenceHwnd = itemMenu->hWnd; - } + menu = MENU_GetMenu(hMenu); + if (!menu) return FALSE; - if ((rect == NULL) || (item == NULL)) - return FALSE; + if (!hwnd) hwnd = menu->hWnd; + if (!hwnd) return FALSE; *rect = item->rect; - MapWindowPoints(referenceHwnd, 0, (LPPOINT)rect, 2); + MapWindowPoints(hwnd, 0, (POINT *)rect, 2); return TRUE; }

1 0

Józef Kucia : wined3d: Add ARB_transform_feedback3 extension.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: d50745b7aeaa770bdc36fc6057a840defb06db02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50745b7aeaa770bdc36fc605… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:05 2017 +0200 wined3d: Add ARB_transform_feedback3 extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e2798f..419eb4d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -183,6 +183,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_transform_feedback2", ARB_TRANSFORM_FEEDBACK2 }, + {"GL_ARB_transform_feedback3", ARB_TRANSFORM_FEEDBACK3 }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, @@ -2877,6 +2878,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glIsTransformFeedback); USE_GL_FUNC(glPauseTransformFeedback); USE_GL_FUNC(glResumeTransformFeedback); + /* GL_ARB_transform_feedback3 */ + USE_GL_FUNC(glBeginQueryIndexed); + USE_GL_FUNC(glDrawTransformFeedbackStream); + USE_GL_FUNC(glEndQueryIndexed); + USE_GL_FUNC(glGetQueryIndexediv); /* GL_ARB_uniform_buffer_object */ USE_GL_FUNC(glBindBufferBase) USE_GL_FUNC(glBindBufferRange) @@ -3696,6 +3702,11 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] = FALSE; } } + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_STREAMS, &gl_max); + TRACE("Max vertex streams: %d.\n", gl_max); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); @@ -3824,6 +3835,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, + {ARB_TRANSFORM_FEEDBACK3, MAKEDWORD_VERSION(4, 0)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b7c8727..6290032 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -116,6 +116,7 @@ enum wined3d_gl_extension ARB_TEXTURE_VIEW, ARB_TIMER_QUERY, ARB_TRANSFORM_FEEDBACK2, + ARB_TRANSFORM_FEEDBACK3, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND,

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::Release implementation.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: d9dcdb0d51daf2eef915520f43ad4af04a74a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9dcdb0d51daf2eef915520f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:49 2017 +0200 msvcrt: Add ThreadScheduler::Release implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index f8afed0..48a9d1b 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -110,6 +110,7 @@ typedef struct { typedef struct { Scheduler scheduler; + LONG ref; unsigned int id; unsigned int virt_proc_no; SchedulerPolicy policy; @@ -519,6 +520,12 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) MSVCRT_operator_delete(this->policy_container); } +static void ThreadScheduler_dtor(ThreadScheduler *this) +{ + if(this->ref != 0) WARN("ref = %d\n", this->ref); + SchedulerPolicy_dtor(&this->policy); +} + DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) { @@ -544,15 +551,22 @@ SchedulerPolicy* __thiscall ThreadScheduler_GetPolicy( DEFINE_THISCALL_WRAPPER(ThreadScheduler_Reference, 4) unsigned int __thiscall ThreadScheduler_Reference(ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return InterlockedIncrement(&this->ref); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Release, 4) unsigned int __thiscall ThreadScheduler_Release(ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + unsigned int ret = InterlockedDecrement(&this->ref); + + TRACE("(%p)\n", this); + + if(!ret) { + ThreadScheduler_dtor(this); + MSVCRT_operator_delete(this); + } + return ret; } DEFINE_THISCALL_WRAPPER(ThreadScheduler_RegisterShutdownEvent, 8) @@ -604,11 +618,6 @@ MSVCRT_bool __thiscall ThreadScheduler_IsAvailableLocation( return FALSE; } -static void ThreadScheduler_dtor(ThreadScheduler *this) -{ - SchedulerPolicy_dtor(&this->policy); -} - DEFINE_THISCALL_WRAPPER(ThreadScheduler_vector_dtor, 8) Scheduler* __thiscall ThreadScheduler_vector_dtor(ThreadScheduler *this, unsigned int flags) { @@ -637,6 +646,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + this->ref = 1; this->id = InterlockedIncrement(&scheduler_id); SchedulerPolicy_copy_ctor(&this->policy, policy);

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::Id implementation.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 118271c5f20917f1943023eaf76801f72646de36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118271c5f20917f1943023eaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:38 2017 +0200 msvcrt: Add ThreadScheduler::Id implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 1c9a770..18e5636 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static int context_id = -1; +static int scheduler_id = -1; #ifdef __i386__ @@ -109,6 +110,7 @@ typedef struct { typedef struct { Scheduler scheduler; + unsigned int id; SchedulerPolicy policy; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -519,8 +521,8 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->id; } DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetNumberOfVirtualProcessors, 4) @@ -632,6 +634,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + this->id = InterlockedIncrement(&scheduler_id); SchedulerPolicy_copy_ctor(&this->policy, policy); return this; }

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::GetPolicy implementation.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 5debf060b8cba0639694f4a8088b2b72b4561f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5debf060b8cba0639694f4a80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:32 2017 +0200 msvcrt: Add ThreadScheduler::GetPolicy implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index a1fd8ba..1c9a770 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -52,6 +52,26 @@ DEFINE_VTBL_WRAPPER(20); #endif +typedef enum { + SchedulerKind, + MaxConcurrency, + MinConcurrency, + TargetOversubscriptionFactor, + LocalContextCacheSize, + ContextStackSize, + ContextPriority, + SchedulingProtocol, + DynamicProgressFeedback, + WinRTInitialization, + last_policy_id +} PolicyElementKey; + +typedef struct { + struct _policy_container { + unsigned int policies[last_policy_id]; + } *policy_container; +} SchedulerPolicy; + typedef struct { const vtable_ptr *vtable; } Context; @@ -89,6 +109,7 @@ typedef struct { typedef struct { Scheduler scheduler; + SchedulerPolicy policy; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -329,26 +350,6 @@ void CDECL Concurrency_Free(void* mem) } } -typedef enum { - SchedulerKind, - MaxConcurrency, - MinConcurrency, - TargetOversubscriptionFactor, - LocalContextCacheSize, - ContextStackSize, - ContextPriority, - SchedulingProtocol, - DynamicProgressFeedback, - WinRTInitialization, - last_policy_id -} PolicyElementKey; - -typedef struct { - struct _policy_container { - unsigned int policies[last_policy_id]; - } *policy_container; -} SchedulerPolicy; - /* ?SetPolicyValue(a)SchedulerPolicy@Concurrency@@QAEIW4PolicyElementKey(a)2@I(a)Z */ /* ?SetPolicyValue(a)SchedulerPolicy@Concurrency@@QEAAIW4PolicyElementKey(a)2@I(a)Z */ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_SetPolicyValue, 12) @@ -533,8 +534,8 @@ DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetPolicy, 8) SchedulerPolicy* __thiscall ThreadScheduler_GetPolicy( const ThreadScheduler *this, SchedulerPolicy *ret) { - FIXME("(%p %p) stub\n", this, ret); - return NULL; + TRACE("(%p %p)\n", this, ret); + return SchedulerPolicy_copy_ctor(ret, &this->policy); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Reference, 4) @@ -602,6 +603,7 @@ MSVCRT_bool __thiscall ThreadScheduler_IsAvailableLocation( static void ThreadScheduler_dtor(ThreadScheduler *this) { + SchedulerPolicy_dtor(&this->policy); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_vector_dtor, 8) @@ -630,6 +632,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + SchedulerPolicy_copy_ctor(&this->policy, policy); return this; }

1 0

Piotr Caban : msvcrt: Add Scheduler class stub.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: b816418471d2c229f54e84d75184d9bd61e5ff31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b816418471d2c229f54e84d75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:17 2017 +0200 msvcrt: Add Scheduler class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 10 +++++----- dlls/msvcr100/msvcr100.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr120_app/msvcr120_app.spec | 10 +++++----- dlls/msvcrt/scheduler.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b816418471d2c229f54e8…

1 0

Henri Verbeet : usp10: Double the languages array size when growing it in GPOS_expand_language_cache ().
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 0ffd5b45ea610ffe9c0c4c7803cb3d98d64760ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffd5b45ea610ffe9c0c4c780… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:02 2017 +0200 usp10: Double the languages array size when growing it in GPOS_expand_language_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 15 ++++++++++----- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3786473..2731c44 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2646,7 +2646,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (script->language_count) { - TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); + TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); @@ -2705,10 +2705,15 @@ static void GPOS_expand_language_cache(LoadedScript *script) if (!(language = usp10_script_get_language(script, tag))) { - script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - script->languages, script->language_count * sizeof(*script->languages)); - language = &script->languages[script->language_count - 1]; + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count + 1, sizeof(*script->languages))) + { + ERR("Failed grow languages array.\n"); + return; + } + + language = &script->languages[script->language_count]; + ++script->language_count; language->tag = tag; } language->gpos_table = (const BYTE *)table + offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9a8b5131..2dfca86 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -164,8 +164,9 @@ typedef struct { const void *gpos_table; LoadedLanguage default_language; BOOL languages_initialized; - INT language_count; LoadedLanguage *languages; + SIZE_T languages_size; + SIZE_T language_count; } LoadedScript; typedef struct {

1 0

Jacek Caban : ntdll/tests: Moved pipe read tests to pipe.c.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 7c26ebfc994d4f884c41e2d0bdf6fb2bf3267a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c26ebfc994d4f884c41e2d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 13:19:25 2017 +0200 ntdll/tests: Moved pipe read tests to pipe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 271 +-------------------------------------------- dlls/ntdll/tests/pipe.c | 287 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 289 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c26ebfc994d4f884c41e…

1 0

Jacek Caban : kernel32/tests: Added tests of pipe write cancelled on process termintation.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 95988a9fefda1719fa38d0ec7f4e757ea41262c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95988a9fefda1719fa38d0ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 12:29:44 2017 +0200 kernel32/tests: Added tests of pipe write cancelled on process termintation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf2a3a3..fb6d3c0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2807,6 +2807,34 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_flush_done(flush_thread); } +static void child_process_write_pipe(HANDLE pipe) +{ + OVERLAPPED overlapped; + char buf[10000]; + + memset(buf, 'x', sizeof(buf)); + overlapped_write_async(pipe, buf, sizeof(buf), &overlapped); + + /* sleep until parent process terminates this process */ + Sleep(INFINITE); +} + +static HANDLE create_writepipe_process(HANDLE pipe) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + BOOL res; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" pipe writepipe %lx", argv[0], (UINT_PTR)pipe); + res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0L, NULL, NULL, &si, &info); + ok(res, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(info.hThread); + + return info.hProcess; +} + static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; @@ -2826,7 +2854,7 @@ static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) test_not_signaled(*server); test_not_signaled(overlapped.hEvent); - *client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + *client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, &sec_attr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); ok(*server != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); res = SetNamedPipeHandleState(*client, &read_mode, NULL, NULL); @@ -2841,6 +2869,8 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) { OVERLAPPED overlapped, overlapped2; HANDLE server, client, flush; + DWORD read_bytes; + HANDLE process; char buf[60000]; BOOL res; @@ -2890,10 +2920,32 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) test_flush_done(flush); CloseHandle(server); CloseHandle(client); + + /* terminate process with pending write */ + create_overlapped_pipe(create_flags, &client, &server); + process = create_writepipe_process(client); + /* succesfully read part of write that is pending in child process */ + res = ReadFile(server, buf, 10, &read_bytes, NULL); + if(!msg_read_mode) + ok(res, "ReadFile failed: %u\n", GetLastError()); + else + ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned: %x %u\n", res, GetLastError()); + ok(read_bytes == 10, "read_bytes = %u\n", read_bytes); + TerminateProcess(process, 0); + winetest_wait_child_process(process); + /* after terminating process, there is no pending write and pipe buffer is empty */ + overlapped_read_async(server, buf, 10, &overlapped); + overlapped_write_sync(client, buf, 1); + test_overlapped_result(server, &overlapped, 1, FALSE); + CloseHandle(process); + CloseHandle(server); + CloseHandle(client); } START_TEST(pipe) { + char **argv; + int argc; HMODULE hmod; hmod = GetModuleHandleA("advapi32.dll"); @@ -2902,6 +2954,16 @@ START_TEST(pipe) pQueueUserAPC = (void *) GetProcAddress(hmod, "QueueUserAPC"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + argc = winetest_get_mainargs(&argv); + + if (argc > 3 && !strcmp(argv[2], "writepipe")) + { + UINT_PTR handle; + sscanf(argv[3], "%lx", &handle); + child_process_write_pipe((HANDLE)handle); + return; + } + if (test_DisconnectNamedPipe()) return; test_CreateNamedPipe_instances_must_match();

1 0

Hans Leidekker : msi: Avoid zero size allocations (Valgrind).
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: d12728a872b03a537ee6d92789fb6cbd2d86ba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12728a872b03a537ee6d9278… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 28 10:45:56 2017 +0200 msi: Avoid zero size allocations (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2b36091..b364d97 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -422,13 +422,11 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg goto err; } - t->row_count = rawsize / row_size; - t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); - if( !t->data ) - goto err; - t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); - if ( !t->data_persistent ) - goto err; + if ((t->row_count = rawsize / row_size)) + { + if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err; + if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err; + } /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count );

1 0