October 2015 - Wine-commits

Sebastian Lackner : ntdll/tests: Add tests for RtlRegisterWait.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 0b1204d8704880bdb9440d485c13a3430e383cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1204d8704880bdb9440d485… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:24:50 2015 +0200 ntdll/tests: Add tests for RtlRegisterWait. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 253 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b1204d8704880bdb9440…

1 0

Piotr Caban : comctl32: Don' t ask for WM_MOUSEHOVER messages when LVS_EX_TRACKSELECT was not specified.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 4dd26ee814abb66731d075eb871f6367994f2682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd26ee814abb66731d075eb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 6 16:19:42 2015 +0200 comctl32: Don't ask for WM_MOUSEHOVER messages when LVS_EX_TRACKSELECT was not specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listview.c | 9 +++++++-- dlls/comctl32/tests/listview.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e3fad51..c0956ad 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4122,6 +4122,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* see if we are supposed to be tracking mouse hovering */ if (LISTVIEW_IsHotTracking(infoPtr)) { TRACKMOUSEEVENT trackinfo; + DWORD flags; trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -4129,8 +4130,12 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* see if we are already tracking this hwnd */ _TrackMouseEvent(&trackinfo); - if(!(trackinfo.dwFlags & TME_HOVER) || trackinfo.hwndTrack != infoPtr->hwndSelf) { - trackinfo.dwFlags = TME_HOVER; + flags = TME_LEAVE; + if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) + flags |= TME_HOVER; + + if((trackinfo.dwFlags & flags) != flags || trackinfo.hwndTrack != infoPtr->hwndSelf) { + trackinfo.dwFlags = flags; trackinfo.dwHoverTime = infoPtr->dwHoverTime; trackinfo.hwndTrack = infoPtr->hwndSelf; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3edb25a..8573318 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5745,6 +5745,46 @@ static void test_header_proc(void) DestroyWindow(hwnd); } +static void test_oneclickactivate(void) +{ + char item1[] = "item1"; + LVITEMA item; + HWND hwnd, fg; + INT r; + + hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + r = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_ONECLICKACTIVATE); + ok(r == 0, "should return zero\n"); + + SetForegroundWindow(hwndparent); + fg = GetForegroundWindow(); + if (fg != hwndparent) + { + skip("Window is not in the foreground. Skipping oneclickactivate tests.\n"); + DestroyWindow(hwnd); + return; + } + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.iImage = 0; + item.pszText = item1; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "should not fail\n"); + + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(0, r); + r = SendMessageA(hwnd, WM_MOUSEHOVER, MAKELONG(1, 1), 0); + expect(0, r); + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5814,6 +5854,7 @@ START_TEST(listview) test_deleteitem(); test_insertitem(); test_header_proc(); + test_oneclickactivate(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Piotr Caban : comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: aa39614e77ebdb21aeb97714c634fbbacc687b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa39614e77ebdb21aeb97714c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 6 16:25:15 2015 +0200 comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8573318..118b4a2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5745,11 +5745,28 @@ static void test_header_proc(void) DestroyWindow(hwnd); } +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + static void test_oneclickactivate(void) { + TRACKMOUSEEVENT track; char item1[] = "item1"; LVITEMA item; HWND hwnd, fg; + RECT rect; INT r; hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, @@ -5775,6 +5792,18 @@ static void test_oneclickactivate(void) r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.left+5, rect.top+5); + flush_events(); + r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); + expect(0, r); + + track.cbSize = sizeof(track); + track.dwFlags = TME_QUERY; + _TrackMouseEvent(&track); + ok(track.hwndTrack == hwnd, "hwndTrack != hwnd\n"); + ok(track.dwFlags == TME_LEAVE, "dwFlags = %x\n", track.dwFlags); + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(0, r); r = SendMessageA(hwnd, WM_MOUSEHOVER, MAKELONG(1, 1), 0);

1 0

Sebastian Lackner : vcomp: Implement _vcomp_get_thread_num.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 0410cf9cbe143720f12c0f8f48e7526a4769cae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0410cf9cbe143720f12c0f8f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 05:46:25 2015 +0200 vcomp: Implement _vcomp_get_thread_num. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/tests/vcomp.c | 7 +++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d442155..5aa0343 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -480,6 +480,12 @@ int CDECL omp_get_thread_num(void) return vcomp_init_thread_data()->thread_num; } +int CDECL _vcomp_get_thread_num(void) +{ + TRACE("()\n"); + return vcomp_init_thread_data()->thread_num; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 83125e1..4f030d3 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -65,6 +65,7 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static int (CDECL *p_vcomp_get_thread_num)(void); static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); @@ -254,6 +255,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_get_thread_num); VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); @@ -306,6 +308,8 @@ static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, thread_num = pomp_get_thread_num(); ok(thread_num >= 0 && thread_num < num_threads, "expected thread_num in range [0, %d], got %d\n", num_threads - 1, thread_num); + ok(thread_num == p_vcomp_get_thread_num(), + "expected _vcomp_get_thread_num to return the same value\n"); is_parallel = pomp_in_parallel(); ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); @@ -344,6 +348,9 @@ static void test_omp_get_num_threads(BOOL nested) int is_nested, is_parallel, max_threads, num_threads, thread_num; LONG thread_count; + ok(pomp_get_thread_num != p_vcomp_get_thread_num, + "expected omp_get_thread_num != _vcomp_get_thread_num\n"); + pomp_set_nested(nested); is_nested = pomp_get_nested(); ok(is_nested == nested, "expected %d, got %d\n", nested, is_nested); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 52b929f..7703e2e 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() @ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 1ee7fba..87a7205 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -66,7 +66,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin

1 0

Alex Henrie : kernel32: Make TERM_dbkey_init const.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 1eef1299f595703acc7fe01a5a834d2eae3923bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eef1299f595703acc7fe01a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:06:21 2015 -0600 kernel32: Make TERM_dbkey_init const. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/term.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 814b937..171476a 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -227,7 +227,7 @@ struct dbkey_init struct dbkey_descr descr; }; -static struct dbkey_init TERM_dbkey_init[] = { +static const struct dbkey_init TERM_dbkey_init[] = { {"kcud1", "kDN", {dbk_complex, 0x50, 0x28, 0}}, {"kcuu1", "kUP", {dbk_complex, 0x48, 0x26, 0}}, {"kcub1", "kLFT", {dbk_complex, 0x4b, 0x25, 0}}, @@ -342,7 +342,7 @@ static int TERM_dbkey_cmp(const void* p1, const void* p2) return strcmp(kp1->string, kp2->string); } -static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) +static BOOL TERM_AddKeyDescr(const char* string, const struct dbkey_descr* descr) { if (!string || string == (const char*)-1) return TRUE; if (!TERM_dbkey)

1 0

Alex Henrie : advapi32: Remove always-true if statements from RegEnumValue [AW].
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 18b7ec94796ed09bef5337e0b02ea374d86de262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b7ec94796ed09bef5337e0b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:06:23 2015 -0600 advapi32: Remove always-true if statements from RegEnumValue[AW]. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/registry.c | 164 ++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 88 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f988c0e..4820b33 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1940,53 +1940,45 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - if (value || data) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (value) + if (info->NameLength/sizeof(WCHAR) >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; + + if (data) + { + if (total_size - info->DataOffset > *count) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; + status = STATUS_BUFFER_OVERFLOW; + goto overflow; } - - if (data) + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) { - if (total_size - info->DataOffset > *count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) - { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; - } + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } } - else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; @@ -2025,74 +2017,70 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; /* we need to fetch the contents for a string type even if not requested, * because we need to compute the length of the ASCII string. */ - if (value || data || is_string(info->Type)) + + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (is_string(info->Type)) + if (is_string(info->Type)) + { + DWORD len; + RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), + total_size - info->DataOffset ); + if (data && len) { - DWORD len; - RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); - if (data && len) + if (len > *count) status = STATUS_BUFFER_OVERFLOW; + else { - if (len > *count) status = STATUS_BUFFER_OVERFLOW; - else - { - RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - if (len < *count && data[len-1]) data[len] = 0; - } + RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), + total_size - info->DataOffset ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (len < *count && data[len-1]) data[len] = 0; } - info->DataLength = len; - } - else if (data) - { - if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); } + info->DataLength = len; + } + else if (data) + { + if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + } - if (value && !status) - { - DWORD len; + if (!status) + { + DWORD len; - RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); - if (len >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - if (*val_count) - { - len = *val_count - 1; - RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); - value[len] = 0; - } - } - else + RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); + if (len >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + if (*val_count) { + len = *val_count - 1; RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); value[len] = 0; - *val_count = len; } } + else + { + RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); + value[len] = 0; + *val_count = len; + } } - else status = STATUS_SUCCESS; if (type) *type = info->Type; if (count) *count = info->DataLength;

1 0

Alex Henrie : comctl32: Remove redundant if (button) statements.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: c565145b0e6b04af591662719c09c2574607df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c565145b0e6b04af591662719… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:16:24 2015 -0600 comctl32: Remove redundant if (button) statements. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 151 ++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 77 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c777f5b..558bfa1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5536,95 +5536,92 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (button) + { btnPtr = &infoPtr->buttons[nHit]; - if (button && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) - { - infoPtr->nButtonDrag = nHit; - SetCapture (infoPtr->hwndSelf); - - /* If drag cursor has not been loaded, load it. - * Note: it doesn't need to be freed */ - if (!hCursorDrag) - hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); - SetCursor(hCursorDrag); - } - else if (button) - { - RECT arrowRect; - infoPtr->nOldHit = nHit; - - CopyRect(&arrowRect, &btnPtr->rect); - arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); - - /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */ - if ((btnPtr->fsState & TBSTATE_ENABLED) && - ((btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) || - ((btnPtr->fsStyle & BTNS_DROPDOWN) && - ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) || - (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle)))))) - { - LRESULT res; + if (bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) + { + infoPtr->nButtonDrag = nHit; + SetCapture (infoPtr->hwndSelf); + + /* If drag cursor has not been loaded, load it. + * Note: it doesn't need to be freed */ + if (!hCursorDrag) + hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); + SetCursor(hCursorDrag); + } + else + { + RECT arrowRect; + infoPtr->nOldHit = nHit; - /* draw in pressed state */ - if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) - btnPtr->fsState |= TBSTATE_PRESSED; - else - btnPtr->bDropDownPressed = TRUE; - RedrawWindow(infoPtr->hwndSelf,&btnPtr->rect,0, - RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW); - - memset(&nmtb, 0, sizeof(nmtb)); - nmtb.iItem = btnPtr->idCommand; - nmtb.rcButton = btnPtr->rect; - res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, - TBN_DROPDOWN); - TRACE("TBN_DROPDOWN responded with %ld\n", res); - - if (res != TBDDRET_TREATPRESSED) + CopyRect(&arrowRect, &btnPtr->rect); + arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); + + /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */ + if ((btnPtr->fsState & TBSTATE_ENABLED) && + ((btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) || + ((btnPtr->fsStyle & BTNS_DROPDOWN) && + ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) || + (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle)))))) { - MSG msg; + LRESULT res; - /* redraw button in unpressed state */ - if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) - btnPtr->fsState &= ~TBSTATE_PRESSED; - else - btnPtr->bDropDownPressed = FALSE; - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + /* draw in pressed state */ + if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) + btnPtr->fsState |= TBSTATE_PRESSED; + else + btnPtr->bDropDownPressed = TRUE; + RedrawWindow(infoPtr->hwndSelf, &btnPtr->rect, 0, RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW); - /* find and set hot item */ - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwndSelf, &pt); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); - if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); - - /* remove any left mouse button down or double-click messages - * so that we can get a toggle effect on the button */ - while (PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDOWN, WM_LBUTTONDOWN, PM_REMOVE) || - PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDBLCLK, WM_LBUTTONDBLCLK, PM_REMOVE)) - ; + memset(&nmtb, 0, sizeof(nmtb)); + nmtb.iItem = btnPtr->idCommand; + nmtb.rcButton = btnPtr->rect; + res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_DROPDOWN); + TRACE("TBN_DROPDOWN responded with %ld\n", res); - return 0; + if (res != TBDDRET_TREATPRESSED) + { + MSG msg; + + /* redraw button in unpressed state */ + if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) + btnPtr->fsState &= ~TBSTATE_PRESSED; + else + btnPtr->bDropDownPressed = FALSE; + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + + /* find and set hot item */ + GetCursorPos(&pt); + ScreenToClient(infoPtr->hwndSelf, &pt); + nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); + if (!infoPtr->bAnchor || button) + TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + + /* remove any left mouse button down or double-click messages + * so that we can get a toggle effect on the button */ + while (PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDOWN, WM_LBUTTONDOWN, PM_REMOVE) || + PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDBLCLK, WM_LBUTTONDBLCLK, PM_REMOVE)) + ; + + return 0; + } + /* otherwise drop through and process as pushed */ } - /* otherwise drop through and process as pushed */ - } - infoPtr->bCaptured = TRUE; - infoPtr->nButtonDown = nHit; - infoPtr->bDragOutSent = FALSE; + infoPtr->bCaptured = TRUE; + infoPtr->nButtonDown = nHit; + infoPtr->bDragOutSent = FALSE; - btnPtr->fsState |= TBSTATE_PRESSED; + btnPtr->fsState |= TBSTATE_PRESSED; - TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); - if (btnPtr->fsState & TBSTATE_ENABLED) - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); - UpdateWindow(infoPtr->hwndSelf); - SetCapture (infoPtr->hwndSelf); - } + if (btnPtr->fsState & TBSTATE_ENABLED) + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + UpdateWindow(infoPtr->hwndSelf); + SetCapture (infoPtr->hwndSelf); + } - if (button) - { memset(&nmtb, 0, sizeof(nmtb)); nmtb.iItem = btnPtr->idCommand; TOOLBAR_SendNotify((NMHDR *)&nmtb, infoPtr, TBN_BEGINDRAG);

1 0

Piotr Caban : comctl32: Don' t use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 9c87c7e76dbb860884308c7f609fb3588d3e686d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c87c7e76dbb860884308c7f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 7 10:17:14 2015 +0200 comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listview.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c0956ad..a76935a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7851,10 +7851,18 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, item.iItem = nItem; if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) { - item.mask |= LVIF_STATE; - item.stateMask |= LVIS_STATEIMAGEMASK; - item.state &= ~LVIS_STATEIMAGEMASK; - item.state |= INDEXTOSTATEIMAGEMASK(1); + if (item.mask & LVIF_STATE) + { + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } + else + { + item.mask |= LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + } } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;

1 0

Dmitry Timoshkov : oleview: Fix compilation with PSDK.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: edb35ff096db2b5c4a2c5c5188963a0947f01028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb35ff096db2b5c4a2c5c518… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:23 2015 +0800 oleview: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 2 +- programs/oleview/typelib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 3a379b4..69f4f9e 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -422,7 +422,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, sizeof(filter_typelib)/sizeof(WCHAR)); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); - snprintfW( filter, MAX_PATH, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); + wsprintfW( filter, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); InitOpenFileName(hWnd, &ofn, filter, wszTitle, wszName); if(GetOpenFileNameW(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); break; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 21e9d96..d07dd3c 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "main.h" #include "wine/debug.h"

1 0

Dmitry Timoshkov : oleview: Correctly set window' s class background and cursor.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: e10db2f22e50b6f575b921f6d3e2d363c2af46b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10db2f22e50b6f575b921f6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:30 2015 +0800 oleview: Correctly set window's class background and cursor. Otherwise background of some windows doesn't match current theme, and mouse cursor sometimes gets stuck after moving over vertical splitter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/details.c | 3 ++- programs/oleview/oleview.c | 1 + programs/oleview/pane.c | 3 ++- programs/oleview/tree.c | 2 ++ programs/oleview/typelib.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 9fdd9f3..49d3dc4 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -397,7 +397,8 @@ HWND CreateDetailsWindow(HINSTANCE hInst) memset(&wcd, 0, sizeof(WNDCLASSW)); wcd.lpfnWndProc = DetailsProc; wcd.lpszClassName = wszDetailsClass; - wcd.hbrBackground = (HBRUSH)COLOR_WINDOW; + wcd.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcd.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wcd)) return NULL; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 69f4f9e..5a11888 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -499,6 +499,7 @@ static BOOL InitApplication(HINSTANCE hInst) memset(&wc, 0, sizeof(WNDCLASSW)); wc.lpfnWndProc = WndProc; wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MENU); wc.lpszClassName = wszAppName; diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index a96da4d..9e4cd28 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -135,7 +135,8 @@ BOOL PaneRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = PaneProc; - wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW); + wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszClassName = wszPaneClass; if(!RegisterClassW(&wcc)) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 17844bf..4a16081 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -703,6 +703,8 @@ HWND CreateTreeWindow(HINSTANCE hInst) memset(&wct, 0, sizeof(WNDCLASSW)); wct.lpfnWndProc = TreeProc; wct.lpszClassName = wszTreeClass; + wct.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wct.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wct)) return NULL; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index d07dd3c..3a60348 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1628,6 +1628,7 @@ BOOL TypeLibRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = TypeLibProc; wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszMenuName = MAKEINTRESOURCEW(IDM_TYPELIB); wcc.lpszClassName = wszTypeLib;

1 0