October 2015 - Wine-Commits

Dmitry Timoshkov : oleview: Always check return value of SendMessage( TVM_GETITEM).
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 26db80b685e9be1191a892e149ec35bc71404072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26db80b685e9be1191a892e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:49 2015 +0800 oleview: Always check return value of SendMessage(TVM_GETITEM). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/tree.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 4a16081..decedc4 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -82,7 +82,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) tvis.hParent = item; tvis.hInsertAfter = TVI_LAST; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if (!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) return; if(!tvi.lParam || ((ITEM_INFO *)tvi.lParam)->loaded || !(((ITEM_INFO *)tvi.lParam)->cFlag&SHOWALL)) return; @@ -154,9 +154,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) while(hCur) { tvi.hItem = hCur; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) { hCur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hCur); @@ -192,9 +190,7 @@ void ReleaseInst(HTREEITEM item) memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) return; + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) return; pU = ((ITEM_INFO *)tvi.lParam)->pU; @@ -223,18 +219,18 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) { TVITEMW tvi; int bufLen; - BOOL ret; + BOOL ret = FALSE; memset(buffer, 0, bufSize * sizeof(WCHAR)); memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); + if (SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) + ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); while(TRUE) { - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && (((ITEM_INFO *)tvi.lParam)->cFlag & (REGPATH|REGTOP))) { @@ -318,7 +314,7 @@ static void AddCOMandAll(void) while(curSearch) { tvi.hItem = curSearch; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && !lstrcmpW(((ITEM_INFO *)tvi.lParam)->info, wszComp)) { @@ -631,15 +627,13 @@ void EmptyTree(void) TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)del); tvi.hItem = del; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(tvi.lParam) + if(SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) && tvi.lParam) { if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); - } - SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + } if(!cur) break; }

1 0

Riccardo Bortolato : wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 9621737c8e7ce3c67f998ef096ea321f9ea2f04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9621737c8e7ce3c67f998ef09… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:49 2015 +0200 wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback. Store wined3d_texture and sub_resource in d3d8_volume. Updated the d3d8_volume_LockBox to make use of wined3d_texture_map. Also updated d3d9, d3d11, ddraw callbacks accordingly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/d3d8_private.h | 6 ++++-- dlls/d3d8/device.c | 10 +++++----- dlls/d3d8/volume.c | 11 +++++++---- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 8 ++++---- dlls/d3d9/volume.c | 6 +++--- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 3 ++- 10 files changed, 34 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9621737c8e7ce3c67f998…

1 0

Riccardo Bortolato : d3d8: Don' t use a wined3d_volume in d3d8_volume_GetDesc.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: eeea2af596859fc2b77ca28685a7a1545e6fe718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeea2af596859fc2b77ca2868… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:51 2015 +0200 d3d8: Don't use a wined3d_volume in d3d8_volume_GetDesc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 3 +-- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index aec4831..ab6a3d4 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -206,12 +206,11 @@ struct d3d8_volume struct d3d8_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_volume *wined3d_volume; struct d3d8_texture *texture; }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_swapchain { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6ba476e..818f601 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3029,7 +3029,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, volume, parent_ops); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 81cd40e..e37330c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -116,13 +116,13 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); @@ -203,12 +203,11 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl; d3d8_resource_init(&volume->resource); volume->resource.refcount = 0; - volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); volume->wined3d_texture = wined3d_texture; volume->sub_resource_idx = sub_resource_idx;

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlRegisterWait.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

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 Oct. 7, 2015

Oct. 7, 2015

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

Alex Henrie : advapi32: Remove always-true if statements from RegEnumValue [AW].
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

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 Oct. 7, 2015

Oct. 7, 2015

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

Sebastian Lackner : ntdll/tests: Fix test failures on Windows 10.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 53c8345c6dc8e8ac013790a7268a0e3f87a15290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c8345c6dc8e8ac013790a72… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:27 2015 +0200 ntdll/tests: Fix test failures on Windows 10. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 7be3f0d..9197660 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -867,6 +867,7 @@ static void test_tp_window_length(void) NTSTATUS status; TP_POOL *pool; DWORD result; + BOOL merged; semaphore = CreateSemaphoreA(NULL, 0, 2, NULL); ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); @@ -929,8 +930,8 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* on Windows the timers also get merged in this case */ info1.ticks = 0; @@ -948,9 +949,9 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; todo_wine - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* cleanup */ pTpReleaseTimer(timer1);

1 0

Riccardo Bortolato : wined3d: Introduce new wined3d_texture_(un) map functions.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: eac95d30b66609c5c924ec36b6049e680c63015f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac95d30b66609c5c924ec36b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:48 2015 +0200 wined3d: Introduce new wined3d_texture_(un)map functions. Initial usage in d3d11. Also removed wined3d_volume_from_resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++--------------------- dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 3 ++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 +++- 6 files changed, 59 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eac95d30b66609c5c924e…

1 0

Henri Verbeet : d2d1: Implement d2d_cdt_incircle() in a more robust way.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 7e6b52e88b5f35caf678f87d45fc0972844400c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6b52e88b5f35caf678f87d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:23 2015 +0200 d2d1: Implement d2d_cdt_incircle() in a more robust way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/geometry.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 327 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e6b52e88b5f35caf678f…

1 0