June 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrrun: Implement get_VolumeName().
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: a0954a193053cf402ff9d8702d9cd81ac6230397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0954a193053cf402ff9d8702… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 24 06:35:43 2014 +0400 scrrun: Implement get_VolumeName(). --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index fc8531c..434b402 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -957,8 +957,19 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, name); + + if (!name) + return E_POINTER; + + *name = NULL; + ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + if (ret) + *name = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ac78483..9410732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1830,6 +1830,15 @@ static void test_SerialNumber(void) ok(name != NULL, "got %p\n", name); SysFreeString(name); + hr = IDrive_get_VolumeName(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_VolumeName(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Piotr Caban : msvcr100: Add critical_section::scoped_lock implementation.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: dab64179236c7c23fc2832d56dc41b8985401595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab64179236c7c23fc2832d56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:43 2014 +0200 msvcr100: Add critical_section::scoped_lock implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcrt/lock.c | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 32fee76..aee50c0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -144,8 +144,8 @@ @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)J@Z @ stub -arch=win32 ??0scheduler_resource_allocation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ thiscall -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=win32 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @ stub -arch=win32 ??0scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @@ -188,8 +188,8 @@ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) MSVCRT_exception_dtor @ stub -arch=win32 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ thiscall -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=win32 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ @ stub -arch=win32 ??1scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f457285..57d7950 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -248,9 +248,9 @@ @ stub -arch=arm ??0scheduler_worker_creation_error(a)Concurrency@@QAA(a)PBDJ@Z @ stub -arch=i386 ??0scheduler_worker_creation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_worker_creation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z -@ stub -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ cdecl -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ thiscall -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=arm ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)AAV12@@Z @ stub -arch=i386 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @@ -323,9 +323,9 @@ @ stub -arch=arm ??1reader_writer_lock(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ(ptr) critical_section_scoped_lock_dtor +@ thiscall -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=arm ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index e4ec6ce..09ff1af 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -366,4 +366,31 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th TRACE("(%p)\n", this); return this; } + +typedef struct +{ + critical_section *cs; + void *unknown[3]; +} critical_section_scoped_lock; + +/* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ +/* ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_ctor, 8) +critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( + critical_section_scoped_lock *this, critical_section *cs) +{ + TRACE("(%p %p)\n", this, cs); + this->cs = cs; + critical_section_lock(this->cs); + return this; +} + +/* ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ */ +/* ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_dtor, 4) +void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock *this) +{ + TRACE("(%p)\n", this); + critical_section_unlock(this->cs); +} #endif

1 0

Vincent Povirk : windowscodecs: Fix interlaced PNG writing.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: e2d6b28a1b2ed064fe14409220e9fce3c0573987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d6b28a1b2ed064fe1440922… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 20 15:11:01 2014 -0500 windowscodecs: Fix interlaced PNG writing. --- dlls/windowscodecs/pngformat.c | 58 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 57 ++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2d6b28a1b2ed064fe144…

1 0

Nikolay Sivov : scrrun: Implement FileSystem property.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 6a2e1b3f31bf3f6745fe26583620be03c5db0bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2e1b3f31bf3f6745fe26583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 22:05:26 2014 +0400 scrrun: Implement FileSystem property. --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4d3c117..fc8531c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -971,8 +971,19 @@ static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, fs); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, fs); + + if (!fs) + return E_POINTER; + + *fs = NULL; + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + if (ret) + *fs = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 7b9354e..ac78483 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1798,6 +1798,7 @@ static void test_SerialNumber(void) VARIANT var; LONG serial; HRESULT hr; + BSTR name; hr = IFileSystem3_get_Drives(fs3, &drives); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1820,6 +1821,15 @@ static void test_SerialNumber(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(serial != 0xdeadbeef, "got %x\n", serial); + hr = IDrive_get_FileSystem(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_FileSystem(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Sebastian Lackner : user32/tests: Add a missing call to ReleaseActCtx().
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 34f8053efe0c1e7ec11fd98e3de78e07cad6d335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f8053efe0c1e7ec11fd98e3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 06:29:09 2014 +0200 user32/tests: Add a missing call to ReleaseActCtx(). --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66b9c7e..6badca1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7024,6 +7024,7 @@ static void test_interthread_messages(void) ret = pGetCurrentActCtx(&handle); ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); + pReleaseActCtx(handle); /* destination window will test for active context */ ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0);

1 0

Nikolay Sivov : scrrun: Implement SerialNumber property.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 5af5e4010383909ff79c9fd8691fb5fcfb0280c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af5e4010383909ff79c9fd86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 21:54:50 2014 +0400 scrrun: Implement SerialNumber property. --- dlls/scrrun/filesystem.c | 11 +++++++++-- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c85fe63..4d3c117 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -978,8 +978,15 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, serial); - return E_NOTIMPL; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, serial); + + if (!serial) + return E_POINTER; + + ret = GetVolumeInformationW(This->root, NULL, 0, (DWORD*)serial, NULL, NULL, NULL, 0); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_IsReady(IDrive *iface, VARIANT_BOOL *ready) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c9b41c0..7b9354e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1790,6 +1790,41 @@ static void test_GetDriveName(void) } } +static void test_SerialNumber(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + VARIANT var; + LONG serial; + HRESULT hr; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_SerialNumber(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + serial = 0xdeadbeef; + hr = IDrive_get_SerialNumber(drive, &serial); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(serial != 0xdeadbeef, "got %x\n", serial); + + IDrive_Release(drive); + IEnumVARIANT_Release(iter); + IDriveCollection_Release(drives); +} + START_TEST(filesystem) { HRESULT hr; @@ -1823,6 +1858,7 @@ START_TEST(filesystem) test_ReadAll(); test_Read(); test_GetDriveName(); + test_SerialNumber(); IFileSystem3_Release(fs3);

1 0

Michael Stefaniuc : comctl32: Functions using setjmp can never be inlined.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: c1cd60957e6bd12938a396e34476bbe219f69812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cd60957e6bd12938a396e34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 22 23:51:25 2014 +0200 comctl32: Functions using setjmp can never be inlined. --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4e0a58d..645068d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -135,7 +135,7 @@ static inline HIMAGELIST impl_from_IImageList2(IImageList2 *iface) static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); -static inline BOOL is_valid(HIMAGELIST himl); +static BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this:

1 0

Sebastian Lackner : comctl32: Allocate new memory in notify_forward_header () to avoid Free() on wrong pointer. (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 392321f4f68cb3d26453680c78aaa81910e15846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392321f4f68cb3d26453680c7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:30:45 2014 +0200 comctl32: Allocate new memory in notify_forward_header() to avoid Free() on wrong pointer. (Valgrind). --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7670f18..bc748c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -784,6 +784,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; + lpnmh->pitem->pszText = NULL; Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ @@ -791,6 +792,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } }

1 0

Sebastian Lackner : server: Avoid invalid memory access when thread is killed while in wake_up(). ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 35e56fb042e60d2182caa0ee25ad9ddba515e12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e56fb042e60d2182caa0ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 21 21:50:40 2014 +0200 server: Avoid invalid memory access when thread is killed while in wake_up(). (Valgrind). --- server/thread.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/thread.c b/server/thread.c index b310e93..50d6940 100644 --- a/server/thread.c +++ b/server/thread.c @@ -700,7 +700,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s } /* attempt to wake up a thread */ -/* return >0 if OK, 0 if the wait condition is still not satisfied */ +/* return >0 if OK, 0 if the wait condition is still not satisfied and -1 on error */ int wake_thread( struct thread *thread ) { int signaled, count; @@ -714,7 +714,10 @@ int wake_thread( struct thread *thread ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ - break; + { + if (!count) count = -1; + break; + } } return count; } @@ -865,12 +868,13 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c void wake_up( struct object *obj, int max ) { struct list *ptr; + int ret; LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (!wake_thread( get_wait_queue_thread( entry ))) continue; - if (max && !--max) break; + if (!(ret = wake_thread( get_wait_queue_thread( entry )))) continue; + if (ret > 0 && max && !--max) break; /* restart at the head of the list since a wake up can change the object wait queue */ ptr = &obj->wait_queue; }

1 0

Sebastian Lackner : kernel32/tests: Add missing HeapFree() in doChildren() . (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: e5e4ef07b6e2a54000bb8572fb8bf69953cdfaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e4ef07b6e2a54000bb8572f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:47:52 2014 +0200 kernel32/tests: Add missing HeapFree() in doChildren(). (Valgrind). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 011ed5f..a802784 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -718,6 +718,8 @@ static void doChildren(int argc, char **argv) blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + + HeapFree(GetProcessHeap(), 0, cmd); } static void test_debug_children(char *name, DWORD flag, BOOL debug_child)

1 0