May 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Remove duplicated expression.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 1ce2797c2f9a3f58152a79f11a59905536f677b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce2797c2f9a3f58152a79f11… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:02:14 2009 +0400 comctl32/listview: Remove duplicated expression. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d9b261..677bc1e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1817,7 +1817,7 @@ static void LISTVIEW_ShowFocusRect(const LISTVIEW_INFO *infoPtr, BOOL fShow) if (infoPtr->nFocusedItem < 0) return; /* we need some gymnastics in ICON mode to handle large items */ - if ( (infoPtr->dwStyle & LVS_TYPEMASK) == LVS_ICON ) + if (uView == LVS_ICON) { RECT rcBox;

1 0

Nikolay Sivov : comctl32/toolbar: Retrieve Tooltips control data once at WinProc.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 7434b8002c13e42a4e02a66faeb7411a11f70a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7434b8002c13e42a4e02a66fa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 23:39:02 2009 +0400 comctl32/toolbar: Retrieve Tooltips control data once at WinProc. --- dlls/comctl32/tooltips.c | 486 ++++++++++++++++++++-------------------------- 1 files changed, 215 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7434b8002c13e42a4e02a…

1 0

Nikolay Sivov : comctl32/hotkey: Remove useless line.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 644b5f0e40d8b848e8165e46ae1fbb17e56843c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644b5f0e40d8b848e8165e46a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 23:36:11 2009 +0400 comctl32/hotkey: Remove useless line. --- dlls/comctl32/hotkey.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 165d95d..a72b487 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -239,10 +239,9 @@ HOTKEY_Create (HOTKEY_INFO *infoPtr, const CREATESTRUCTW *lpcs) static LRESULT HOTKEY_Destroy (HOTKEY_INFO *infoPtr) { - HWND hwnd = infoPtr->hwndSelf; /* free hotkey info data */ + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); Free (infoPtr); - SetWindowLongPtrW (hwnd, 0, 0); return 0; }

1 0

Nikolay Sivov : comctl32/listview: Draw focus rectangle only when visible.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: c46a5141da0de48cb52c61a952d596a8736020b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46a5141da0de48cb52c61a95… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:36:14 2009 +0400 comctl32/listview: Draw focus rectangle only when visible. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8ddaf3d..75ce291 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4305,6 +4305,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra ITERATOR i; HDC hdcOrig = hdc; HBITMAP hbmp = NULL; + RANGE range; LISTVIEW_DUMP(infoPtr); @@ -4370,11 +4371,11 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra /* figure out what we need to draw */ iterator_visibleitems(&i, infoPtr, hdc); - + range = iterator_range(&i); + /* send cache hint notification */ if (infoPtr->dwStyle & LVS_OWNERDATA) { - RANGE range = iterator_range(&i); NMLVCACHEHINT nmlv; ZeroMemory(&nmlv, sizeof(NMLVCACHEHINT)); @@ -4392,8 +4393,9 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra else /* LVS_LIST, LVS_ICON or LVS_SMALLICON */ LISTVIEW_RefreshList(infoPtr, &i, hdc, cdmode); - /* if we have a focus rect, draw it */ - if (infoPtr->bFocus) + /* if we have a focus rect and it's visible, draw it */ + if (infoPtr->bFocus && range.lower <= infoPtr->nFocusedItem && + (range.upper - 1) >= infoPtr->nFocusedItem) LISTVIEW_DrawFocusRect(infoPtr, hdc); } iterator_destroy(&i);

1 0

Nikolay Sivov : comctl32/treeview: Use message return values in TreeView tests.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 4db999ebdf0d27bc124636dd2a51671f6ed46c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db999ebdf0d27bc124636dd2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:43:18 2009 +0400 comctl32/treeview: Use message return values in TreeView tests. --- dlls/comctl32/tests/treeview.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 05a5237..73b34e4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -276,7 +276,8 @@ static void TestCallback(void) CHAR buf[128]; LRESULT ret; - TreeView_DeleteAllItems(hTree); + ret = TreeView_DeleteAllItems(hTree); + ok(ret == TRUE, "ret\n"); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT; @@ -301,7 +302,8 @@ static void TestCallback(void) assert(hItem1); tvi.hItem = hItem1; - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "ret\n"); ok(strcmp(tvi.pszText, test_string) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, test_string); @@ -310,7 +312,8 @@ static void TestCallback(void) ret = TreeView_SetItem(hTree, &tvi); ok(ret == 1, "Expected SetItem return 1, got %ld\n", ret); tvi.pszText = buf; - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "Expected GetItem return TRUE, got %ld\n", ret); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); @@ -319,7 +322,8 @@ static void TestCallback(void) assert(hItem2); tvi.hItem = hItem2; memset(buf, 0, sizeof(buf)); - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "Expected GetItem return TRUE, got %ld\n", ret); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); } @@ -755,6 +759,7 @@ static void TestExpandInvisible(void) HTREEITEM node[5]; RECT dummyRect; BOOL nodeVisible; + LRESULT ret; /* The test builds the following tree and expands then node 1, while node 0 is collapsed. * @@ -766,8 +771,8 @@ static void TestExpandInvisible(void) * */ - TreeView_DeleteAllItems(hTree); - + ret = TreeView_DeleteAllItems(hTree); + ok(ret == TRUE, "ret\n"); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT;

1 0

Nikolay Sivov : comctl32/toolbar: Don't free Toolbar control data too early .
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 8296075fa7f08dc8f2dfa5827ca3119e6a5e42e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8296075fa7f08dc8f2dfa5827… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:45:57 2009 +0400 comctl32/toolbar: Don't free Toolbar control data too early. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 06bf239..5a0344f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5322,8 +5322,8 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); /* free toolbar info data */ - Free (infoPtr); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + Free (infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/listview: Fix returning LVHT_ONITEMSTATEICON flag on hittesting.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: ce12717c9e8dfa9831157b699e5af4a133a513e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce12717c9e8dfa9831157b699… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:39:31 2009 +0400 comctl32/listview: Fix returning LVHT_ONITEMSTATEICON flag on hittesting. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75ce291..4d9b261 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6593,7 +6593,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_ONITEMICON; else if (PtInRect(&rcLabel, opt)) lpht->flags |= LVHT_ONITEMLABEL; - else if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && PtInRect(&rcState, opt)) + else if (infoPtr->himlState && PtInRect(&rcState, opt)) lpht->flags |= LVHT_ONITEMSTATEICON; /* special case for LVS_EX_FULLROWSELECT */ if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d3e4ee8..cd171cb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2389,13 +2389,17 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); - /* try with icons */ + /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); r = ImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); + hbmp = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbmp, 0); + ok(r == 1, "should be one\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); ok(r == 0, "should return zero\n"); @@ -2407,10 +2411,24 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); expect(TRUE, r); /* on state icon */ - x = pos.x + 8; /* outside column */ + x = pos.x + 8; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + + /* state icons indices are 1 based, check with valid index */ + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1); + item.stateMask = LVIS_STATEIMAGEMASK; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + /* on state icon */ + x = pos.x + 8; y = pos.y + (bounds.bottom - bounds.top) / 2; - test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, TRUE, __LINE__); + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2418,7 +2436,7 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); ok(r == 0, "should return zero\n"); /* on item icon */ - x = pos.x + 8; /* outside column */ + x = pos.x + 8; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__);

1 0

Jacek Caban : mshtml: Use TLS_OUT_OF_INDEXES as invalid TLS value.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 88f7fd5deacf3c36890aa96e3515fda3c531be03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f7fd5deacf3c36890aa96e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 23:17:03 2009 +0200 mshtml: Use TLS_OUT_OF_INDEXES as invalid TLS value. Spotted by Vitaliy Margolen. --- dlls/mshtml/main.c | 4 ++-- dlls/mshtml/task.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index aed4d76..3057276 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; -DWORD mshtml_tls = 0; +DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; @@ -69,7 +69,7 @@ static void process_detach(void) if(shdoclc) FreeLibrary(shdoclc); - if(mshtml_tls) + if(mshtml_tls != TLS_OUT_OF_INDEXES) TlsFree(mshtml_tls); } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index ffef543..496b96f 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -478,11 +478,19 @@ thread_data_t *get_thread_data(BOOL create) { thread_data_t *thread_data; - if(!mshtml_tls) { - if(create) - mshtml_tls = TlsAlloc(); - else + if(mshtml_tls == TLS_OUT_OF_INDEXES) { + DWORD tls; + + if(!create) + return NULL; + + tls = TlsAlloc(); + if(tls == TLS_OUT_OF_INDEXES) return NULL; + + tls = InterlockedCompareExchange((LONG*)&mshtml_tls, tls, TLS_OUT_OF_INDEXES); + if(tls != mshtml_tls) + TlsFree(tls); } thread_data = TlsGetValue(mshtml_tls);

1 0

Jacek Caban : urlmon: Use TLS_OUT_OF_INDEXES as invalid TLS value.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 08d8a5ea259cd93f3f0fae3d467cd4524b550abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d8a5ea259cd93f3f0fae3d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 23:16:21 2009 +0200 urlmon: Use TLS_OUT_OF_INDEXES as invalid TLS value. --- dlls/urlmon/urlmon_main.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 3203753..6e51db5 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -36,7 +36,7 @@ LONG URLMON_refCount = 0; HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; -static DWORD urlmon_tls; +static DWORD urlmon_tls = TLS_OUT_OF_INDEXES; static void init_session(BOOL); @@ -56,9 +56,12 @@ tls_data_t *get_tls_data(void) { tls_data_t *data; - if(!urlmon_tls) { + if(urlmon_tls == TLS_OUT_OF_INDEXES) { DWORD tls = TlsAlloc(); - tls = InterlockedCompareExchange((LONG*)&urlmon_tls, tls, 0); + if(tls == TLS_OUT_OF_INDEXES) + return NULL; + + tls = InterlockedCompareExchange((LONG*)&urlmon_tls, tls, TLS_OUT_OF_INDEXES); if(tls != urlmon_tls) TlsFree(tls); } @@ -83,7 +86,7 @@ static void free_tls_list(void) { tls_data_t *data; - if(!urlmon_tls) + if(urlmon_tls == TLS_OUT_OF_INDEXES) return; while(!list_empty(&tls_list)) { @@ -99,7 +102,7 @@ static void detach_thread(void) { tls_data_t *data; - if(!urlmon_tls) + if(urlmon_tls == TLS_OUT_OF_INDEXES) return; data = TlsGetValue(urlmon_tls);

1 0

Paul Vriens : kernel32/tests: Fix comment.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: bb4168ab7373e465b83a24f7e591cfbe1d4492be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4168ab7373e465b83a24f7e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 25 10:29:01 2009 +0200 kernel32/tests: Fix comment. --- dlls/kernel32/tests/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 6454731..e447e0f 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -67,7 +67,7 @@ static void test_query_dos_deviceA(void) } for (;drivestr[0] <= 'z'; drivestr[0]++) { - /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 big */ + /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 */ ret = QueryDosDeviceA( drivestr, buffer, buflen - 1); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p);

1 0