July 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/treeview: Properly initialize expanded image index .
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: b3a61c1329d1577eed17e1d46909ee2e293c47f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a61c1329d1577eed17e1d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 12:53:08 2010 +0400 comctl32/treeview: Properly initialize expanded image index. --- dlls/comctl32/tests/treeview.c | 70 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 4 +- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 18528e3..d3de85f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -30,6 +30,7 @@ #include "commctrl.h" #include "wine/test.h" +#include "v6util.h" #include "msg.h" const char *TEST_CALLBACK_TEXT = "callback_text"; @@ -1191,12 +1192,55 @@ static void test_rect_retrieval_after_expand_with_select(void) { ok(ret,"TreeView_Select should return true\n"); } +static void test_expandedimage(void) +{ + TVITEMEX item; + HWND hTree; + BOOL ret; + + hTree = create_treeview_control(); + fill_tree(hTree); + + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = 1; + item.hItem = hRoot; + ret = SendMessageA(hTree, TVM_SETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = -1; + item.hItem = hRoot; + ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + if (item.iExpandedImage != 1) + { + win_skip("TVIF_EXPANDEDIMAGE not supported\n"); + DestroyWindow(hTree); + return; + } + + /* test for default iExpandedImage value */ + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = -1; + item.hItem = hChild; + ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + ok(item.iExpandedImage == (WORD)I_IMAGENONE, "got %d\n", item.iExpandedImage); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; MSG msg; + + ULONG_PTR ctx_cookie; + HANDLE hCtx; + HWND hwnd; hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); @@ -1253,6 +1297,32 @@ START_TEST(treeview) test_expandnotify(); test_rect_retrieval_after_expand_with_select(); + if (!load_v6_module(&ctx_cookie, &hCtx)) + { + DestroyWindow(hMainWnd); + return; + } + + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, WC_TREEVIEW, "foo", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hMainWnd, NULL, GetModuleHandleA(NULL), NULL); + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create TreeView window.\n"); + unload_v6_module(ctx_cookie, hCtx); + DestroyWindow(hMainWnd); + return; + } + else + DestroyWindow(hwnd); + + /* comctl32 version 6 tests start here */ + test_expandedimage(); + + unload_v6_module(ctx_cookie, hCtx); + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b49bbcd..8683b4a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1005,7 +1005,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) * inc/dec to toggle the images. */ newItem->iImage = 0; newItem->iSelectedImage = 0; - newItem->iExpandedImage = 0; + newItem->iExpandedImage = (WORD)I_IMAGENONE; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -2575,7 +2575,7 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem /* The item is currently selected */ imageIndex = wineItem->iSelectedImage; } - else if ((wineItem->state & TVIS_EXPANDED) && (wineItem->iExpandedImage >= 0)) + else if ((wineItem->state & TVIS_EXPANDED) && (wineItem->iExpandedImage != (WORD)I_IMAGENONE)) { /* The item is currently not selected but expanded */ imageIndex = wineItem->iExpandedImage;

1 0

Nikolay Sivov : comctl32/treeview: Fix TVS_SINGLEEXPAND notifications order .
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 16dfb1a03974c2627a3b24b51399ba27d3f981aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dfb1a03974c2627a3b24b51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 15:49:09 2010 +0400 comctl32/treeview: Fix TVS_SINGLEEXPAND notifications order. --- dlls/comctl32/tests/treeview.c | 29 ++++++++++ dlls/comctl32/treeview.c | 117 +++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d3de85f..d1ca581 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -192,6 +192,15 @@ static const struct message parent_expand_seq[] = { { 0 } }; +static const struct message parent_singleexpand_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + static const struct message empty_seq[] = { { 0 } }; @@ -1231,6 +1240,25 @@ static void test_expandedimage(void) DestroyWindow(hTree); } +static void test_TVS_SINGLEEXPAND(void) +{ + HWND hTree; + BOOL ret; + + hTree = create_treeview_control(); + SetWindowLongA(hTree, GWL_STYLE, GetWindowLong(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); + /* to avoid paiting related notifications */ + ShowWindow(hTree, SW_HIDE); + fill_tree(hTree); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + ok(ret, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1296,6 +1324,7 @@ START_TEST(treeview) test_treeview_classinfo(); test_expandnotify(); test_rect_retrieval_after_expand_with_select(); + test_TVS_SINGLEEXPAND(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8683b4a..3ee1639 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3305,7 +3305,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, static BOOL TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, - BOOL bExpandPartial, BOOL bUser) + BOOL partial, BOOL user) { LONG scrollDist; LONG orgNextTop = 0; @@ -3313,7 +3313,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TREEVIEW_ITEM *nextItem, *tmpItem; BOOL sendsNotifications; - TRACE("(%p, %p, partial=%d, %d\n", infoPtr, wineItem, bExpandPartial, bUser); + TRACE("(%p, %p, partial=%d, %d\n", infoPtr, wineItem, partial, user); if (wineItem->state & TVIS_EXPANDED) return TRUE; @@ -3334,7 +3334,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TRACE("TVE_EXPAND %p %s\n", wineItem, TREEVIEW_ItemName(wineItem)); - sendsNotifications = bUser || ((wineItem->cChildren != 0) && + sendsNotifications = user || ((wineItem->cChildren != 0) && !(wineItem->state & TVIS_EXPANDEDONCE)); if (sendsNotifications) { @@ -3349,7 +3349,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, wineItem->state |= TVIS_EXPANDED; - if (bExpandPartial) + if (partial) FIXME("TVE_EXPANDPARTIAL not implemented\n"); if (ISVISIBLE(wineItem)) @@ -3415,6 +3415,58 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, return TRUE; } +/* Handler for TVS_SINGLEEXPAND behaviour. Used on response + to mouse messages and TVM_SELECTITEM. + + selection - previously selected item, used to collapse a part of a tree + item - new selected item +*/ +static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, + HTREEITEM selection, HTREEITEM item) +{ + TREEVIEW_ITEM *SelItem; + + if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit) return; + + TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, item, 0); + + /* + * Close the previous selection all the way to the root + * as long as the new selection is not a child + */ + if(selection && (selection != item)) + { + BOOL closeit = TRUE; + SelItem = item; + + /* determine if the hitItem is a child of the currently selected item */ + while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && + (SelItem->parent != infoPtr->root)) + { + closeit = (SelItem != selection); + SelItem = SelItem->parent; + } + + if(closeit) + { + if(TREEVIEW_ValidItem(infoPtr, selection)) + SelItem = selection; + + while(SelItem && (SelItem != item) && TREEVIEW_ValidItem(infoPtr, SelItem) && + SelItem->parent != infoPtr->root) + { + TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); + SelItem = SelItem->parent; + } + } + } + + /* + * Expand the current item + */ + TREEVIEW_Expand(infoPtr, item, FALSE, FALSE); +} + static BOOL TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, BOOL bUser) { @@ -4132,58 +4184,11 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ { - /* - * if we are TVS_SINGLEEXPAND then we want this single click to - * do a bunch of things. - */ - if((infoPtr->dwStyle & TVS_SINGLEEXPAND) && - (infoPtr->hwndEdit == 0)) - { - TREEVIEW_ITEM *SelItem; - - /* - * Send the notification - */ - TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, ht.hItem, 0); - - /* - * Close the previous selection all the way to the root - * as long as the new selection is not a child - */ - if((infoPtr->selectedItem) - && (infoPtr->selectedItem != ht.hItem)) - { - BOOL closeit = TRUE; - SelItem = ht.hItem; - - /* determine if the hitItem is a child of the currently selected item */ - while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && (SelItem != infoPtr->root)) - { - closeit = (SelItem != infoPtr->selectedItem); - SelItem = SelItem->parent; - } - - if(closeit) - { - if(TREEVIEW_ValidItem(infoPtr, infoPtr->selectedItem)) - SelItem = infoPtr->selectedItem; - - while(SelItem && (SelItem != ht.hItem) && TREEVIEW_ValidItem(infoPtr, SelItem) && (SelItem != infoPtr->root)) - { - TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); - SelItem = SelItem->parent; - } - } - } - - /* - * Expand the current item - */ - TREEVIEW_Expand(infoPtr, ht.hItem, TVE_TOGGLE, FALSE); - } + TREEVIEW_ITEM *selection = infoPtr->selectedItem; /* Select the current item */ TREEVIEW_DoSelectItem(infoPtr, TVGN_CARET, ht.hItem, TVC_BYMOUSE); + TREEVIEW_SingleExpand(infoPtr, selection, ht.hItem); } else if (ht.flags & TVHT_ONITEMSTATEICON) { @@ -4415,7 +4420,9 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, static LRESULT TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) { - if (item != NULL && !TREEVIEW_ValidItem(infoPtr, item)) + TREEVIEW_ITEM *selection = infoPtr->selectedItem; + + if (item && !TREEVIEW_ValidItem(infoPtr, item)) return FALSE; TRACE("%p (%s) %d\n", item, TREEVIEW_ItemName(item), wParam); @@ -4423,6 +4430,8 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) if (!TREEVIEW_DoSelectItem(infoPtr, wParam, item, TVC_UNKNOWN)) return FALSE; + TREEVIEW_SingleExpand(infoPtr, selection, item); + return TRUE; }

1 0

Nikolay Sivov : comctl32/tests: Merge one test function to existing tests, use explicit message numbers.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 6711780a8fba24afcb1436dcc7cb5474ebf4c649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6711780a8fba24afcb1436dcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 15:59:54 2010 +0400 comctl32/tests: Merge one test function to existing tests, use explicit message numbers. --- dlls/comctl32/tests/treeview.c | 75 +++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d1ca581..a0a3e23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -70,8 +70,8 @@ static const struct message rootchild_select_seq[] = { }; static const struct message getitemtext_seq[] = { - { TVM_INSERTITEM, sent }, - { TVM_GETITEM, sent }, + { TVM_INSERTITEMA, sent }, + { TVM_GETITEMA, sent }, { TVM_DELETEITEM, sent }, { 0 } }; @@ -134,10 +134,10 @@ static const struct message test_get_set_insertmarkcolor_seq[] = { }; static const struct message test_get_set_item_seq[] = { - { TVM_GETITEM, sent }, - { TVM_SETITEM, sent }, - { TVM_GETITEM, sent }, - { TVM_SETITEM, sent }, + { TVM_GETITEMA, sent }, + { TVM_SETITEMA, sent }, + { TVM_GETITEMA, sent }, + { TVM_SETITEMA, sent }, { 0 } }; @@ -187,8 +187,8 @@ static const struct message test_get_set_unicodeformat_seq[] = { }; static const struct message parent_expand_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDING }, - { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDED }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { 0 } }; @@ -302,7 +302,7 @@ static void fill_tree(HWND hTree) static void test_fillroot(void) { - TVITEM tvi; + TVITEMA tvi; HWND hTree; hTree = create_treeview_control(); @@ -323,7 +323,7 @@ static void test_fillroot(void) /* UMLPad 1.15 depends on this being not -1 (I_IMAGECALLBACK) */ tvi.hItem = hRoot; tvi.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tvi ); ok(tvi.iImage == 0, "tvi.iImage=%d\n", tvi.iImage); ok(tvi.iSelectedImage == 0, "tvi.iSelectedImage=%d\n", tvi.iSelectedImage); @@ -335,7 +335,7 @@ static void test_callback(void) HTREEITEM hRoot; HTREEITEM hItem1, hItem2; TVINSERTSTRUCTA ins; - TVITEM tvi; + TVITEMA tvi; CHAR test_string[] = "Test_string"; CHAR buf[128]; LRESULT ret; @@ -464,7 +464,7 @@ static void test_getitemtext(void) { TVINSERTSTRUCTA ins; HTREEITEM hChild; - TVITEM tvi; + TVITEMA tvi; HWND hTree; CHAR szBuffer[80] = "Blah"; @@ -490,7 +490,7 @@ static void test_getitemtext(void) tvi.cchTextMax = nBufferSize; tvi.pszText = szBuffer; - SendMessageA( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); + SendMessageA( hTree, TVM_GETITEMA, 0, (LPARAM)&tvi ); ok(!strcmp(szBuffer, ""), "szBuffer=\"%s\", expected \"\"\n", szBuffer); ok(SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild), "DeleteItem failed\n"); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, getitemtext_seq, "get item text seq", FALSE); @@ -645,7 +645,7 @@ static void test_get_set_insertmark(void) static void test_get_set_item(void) { - TVITEM tviRoot = {0}; + TVITEMA tviRoot = {0}; int nBufferSize = 80; char szBuffer[80] = {0}; HWND hTree; @@ -660,20 +660,20 @@ static void test_get_set_item(void) tviRoot.mask = TVIF_TEXT; tviRoot.cchTextMax = nBufferSize; tviRoot.pszText = szBuffer; - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); ok(!strcmp("Root", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Root\"\n", szBuffer); /* Change the root text */ strncpy(szBuffer, "Testing123", nBufferSize); - SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_SETITEMA, 0, (LPARAM)&tviRoot ); memset(szBuffer, 0, nBufferSize); - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); ok(!strcmp("Testing123", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Testing123\"\n", szBuffer); /* Reset the root text */ memset(szBuffer, 0, nBufferSize); strncpy(szBuffer, "Root", nBufferSize); - SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_SETITEMA, 0, (LPARAM)&tviRoot ); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_item_seq, "test get set item", FALSE); @@ -889,7 +889,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } case TVN_ENDLABELEDIT: return TRUE; - case TVN_ITEMEXPANDING: + case TVN_ITEMEXPANDINGA: ok(pTreeView->itemNew.mask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); @@ -906,7 +906,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(ret == TRUE, "got %lu\n", ret); } break; - case TVN_ITEMEXPANDED: + case TVN_ITEMEXPANDEDA: ok(pTreeView->itemNew.mask & TVIF_STATE, "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemNew.state & (TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got wrong mask %x\n", pTreeView->itemNew.mask); @@ -920,7 +920,8 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ret = SendMessageA(pHdr->hwndFrom, TVM_GETITEMA, 0, (LPARAM)&g_item_expanded); ok(ret == TRUE, "got %lu\n", ret); } - if (g_get_rect_in_expand) { + if (g_get_rect_in_expand) + { visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, NULL, TVGN_FIRSTVISIBLE); ok(pTreeView->itemNew.hItem == visibleItem, "expanded item == first visible item\n"); *(HTREEITEM*)&rect = visibleItem; @@ -1082,7 +1083,7 @@ static void test_itemedit(void) item.hItem = hRoot; item.pszText = buff; item.cchTextMax = sizeof(buff)/sizeof(CHAR); - r = SendMessage(hTree, TVM_GETITEM, 0, (LPARAM)&item); + r = SendMessage(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); ok(!strcmp("x", buff), "Expected item text to change\n"); @@ -1188,22 +1189,20 @@ static void test_expandnotify(void) ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "collapse after expand notifications", FALSE); DestroyWindow(hTree); -} -static void test_rect_retrieval_after_expand_with_select(void) { - BOOL ret; - HWND hTree; - hTree = create_treeview_control(); - fill_tree(hTree); - g_get_rect_in_expand = TRUE; - ret = TreeView_Select(hTree, hChild, TVGN_CARET); - g_get_rect_in_expand = FALSE; - ok(ret,"TreeView_Select should return true\n"); + /* test TVM_GETITEMRECT inside TVN_ITEMEXPANDED notification */ + hTree = create_treeview_control(); + fill_tree(hTree); + g_get_rect_in_expand = TRUE; + ret = TreeView_Select(hTree, hChild, TVGN_CARET); + g_get_rect_in_expand = FALSE; + ok(ret, "got %d\n", ret); + DestroyWindow(hTree); } static void test_expandedimage(void) { - TVITEMEX item; + TVITEMEXA item; HWND hTree; BOOL ret; @@ -1213,13 +1212,13 @@ static void test_expandedimage(void) item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = 1; item.hItem = hRoot; - ret = SendMessageA(hTree, TVM_SETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = -1; item.hItem = hRoot; - ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); if (item.iExpandedImage != 1) @@ -1233,7 +1232,7 @@ static void test_expandedimage(void) item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = -1; item.hItem = hChild; - ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); ok(item.iExpandedImage == (WORD)I_IMAGENONE, "got %d\n", item.iExpandedImage); @@ -1323,7 +1322,6 @@ START_TEST(treeview) test_itemedit(); test_treeview_classinfo(); test_expandnotify(); - test_rect_retrieval_after_expand_with_select(); test_TVS_SINGLEEXPAND(); if (!load_v6_module(&ctx_cookie, &hCtx)) @@ -1353,7 +1351,8 @@ START_TEST(treeview) unload_v6_module(ctx_cookie, hCtx); PostMessageA(hMainWnd, WM_CLOSE, 0, 0); - while(GetMessageA(&msg,0,0,0)) { + while(GetMessageA(&msg, 0, 0, 0)) + { TranslateMessage(&msg); DispatchMessageA(&msg); }

1 0

Jacek Caban : mshtml: Removed frozen status comments from nsiface.idl.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f6299c1bf865596943c877827adcecf52d016b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6299c1bf865596943c877827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 26 15:45:47 2010 +0200 mshtml: Removed frozen status comments from nsiface.idl. All interfaces were recently unfrozen for upcoming mozilla2 (Firefox 4) anyway. --- dlls/mshtml/nsiface.idl | 114 ----------------------------------------------- 1 files changed, 0 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6299c1bf865596943c87…

1 0

Ilya Basin : shell32: Fix CommandLineToArgvW("") truncating returned exe path.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 9dee1b24eea47a8fc9dafdad4558bfe33e9ca0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dee1b24eea47a8fc9dafdad4… Author: Ilya Basin <basinilya(a)gmail.com> Date: Sat Jul 24 20:42:10 2010 +0400 shell32: Fix CommandLineToArgvW("") truncating returned exe path. --- dlls/shell32/shell32_main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index f906a24..a166150 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -94,20 +94,22 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*lpCmdline==0) { /* Return the path to the executable */ - DWORD len, size=16; + DWORD len, deslen=MAX_PATH, size; - argv=LocalAlloc(LMEM_FIXED, size); + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); for (;;) { - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); + if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; + len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); if (!len) { LocalFree(argv); return NULL; } - if (len < size) break; - size*=2; - argv=LocalReAlloc(argv, size, 0); + if (len < deslen) break; + deslen*=2; + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); if (numargs)

1 0

Ilya Basin : shell32/tests: CommandLineToArgvW("") shouldn' t truncate returned exe path.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 3b545300b85ca23c53dfb56478182b29e37c9beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b545300b85ca23c53dfb5647… Author: Ilya Basin <basinilya(a)gmail.com> Date: Sat Jul 24 20:42:15 2010 +0400 shell32/tests: CommandLineToArgvW("") shouldn't truncate returned exe path. --- dlls/shell32/tests/shlexec.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b883d0b..47f640f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2118,8 +2118,9 @@ static void test_commandline(void) static const WCHAR chkfmt3[] = {'\\','\"','%','s','\"',0}; static const WCHAR chkfmt4[] = {'%','s','=','%','s','\"',' ','%','s','\"',0}; WCHAR cmdline[255]; - LPWSTR *args = (LPWSTR*)0xdeadcafe; + LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; + size_t buflen; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2170,6 +2171,15 @@ static void test_commandline(void) wsprintfW(cmdline,fmt6); args=CommandLineToArgvW(cmdline,&numargs); ok(numargs == 1, "expected 1 args, got %i\n",numargs); + if (numargs == 1) { + buflen = max(lstrlenW(args[0])+1,256); + pbuf = HeapAlloc(GetProcessHeap(), 0, buflen*sizeof(pbuf[0])); + GetModuleFileNameW(NULL, pbuf, buflen); + pbuf[buflen-1] = 0; + /* check args[0] is module file name */ + ok(lstrcmpW(args[0],pbuf)==0, "wrong path to the current executable\n"); + HeapFree(GetProcessHeap(), 0, pbuf); + } } START_TEST(shlexec)

1 0

Alexandre Julliard : gdi32: Store the total visible rectangle in the DC.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 69c8f0b67d445493a83dc932aaacefc26bb42c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c8f0b67d445493a83dc932a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:30:26 2010 +0200 gdi32: Store the total visible rectangle in the DC. --- dlls/gdi32/bitmap.c | 4 ++++ dlls/gdi32/clipping.c | 1 + dlls/gdi32/dc.c | 19 +++++++++++++++---- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 937a67d..e5a02be 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -611,6 +611,10 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hBitmap = handle; GDI_inc_ref_count( handle ); dc->dirty = 0; + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = bitmap->bitmap.bmWidth; + dc->vis_rect.bottom = bitmap->bitmap.bmHeight; SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); GDI_ReleaseObj( handle ); DC_InitDC( dc ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index e865656..142c520 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -171,6 +171,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) DeleteObject( dc->hVisRgn ); dc->dirty = 0; + dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7c86d34..738e42e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -666,8 +666,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, goto error; } - SetRectRgn( dc->hVisRgn, 0, 0, - GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn(dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, dc->vis_rect.right, dc->vis_rect.bottom); DC_InitDC( dc ); release_dc_ptr( dc ); @@ -768,6 +771,10 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) TRACE("(%p): returning %p\n", hdc, dc->hSelf ); dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = 1; + dc->vis_rect.bottom = 1; if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ /* Copy the driver-specific physical device info into @@ -860,8 +867,12 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) if (ret) /* reset the visible region */ { dc->dirty = 0; - SetRectRgn( dc->hVisRgn, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), - GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn( dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, + dc->vis_rect.right, dc->vis_rect.bottom ); CLIPPING_UpdateGCRegion( dc ); } } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d1cb66b..8ac78ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -261,6 +261,7 @@ typedef struct tagDC INT vportExtY; SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ + RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miterLimit; int flags;

1 0

Alexandre Julliard : gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 1472f35e823f84721d867494148f721d72f9dc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1472f35e823f84721d8674941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:28:02 2010 +0200 gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point. --- dlls/gdi32/clipping.c | 20 +++++++++----------- dlls/gdi32/gdi32.spec | 2 +- dlls/user32/painting.c | 5 +---- dlls/user32/sysparams.c | 2 -- include/wingdi.h | 5 ++++- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index a942fe1..e865656 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -156,26 +156,24 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } /*********************************************************************** - * SelectVisRgn (GDI32.@) - * - * Note: not exported on Windows, only the 16-bit version is exported. + * __wine_set_visible_region (GDI32.@) */ -INT WINAPI SelectVisRgn( HDC hdc, HRGN hrgn ) +void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) { - int retval; DC * dc; - if (!hrgn) return ERROR; - if (!(dc = get_dc_ptr( hdc ))) return ERROR; + if (!(dc = get_dc_ptr( hdc ))) return; - TRACE("%p %p\n", hdc, hrgn ); + TRACE( "%p %p %s\n", hdc, hrgn, wine_dbgstr_rect(vis_rect) ); - dc->dirty = 0; + /* map region to DC coordinates */ + OffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); - retval = CombineRgn( dc->hVisRgn, hrgn, 0, RGN_COPY ); + DeleteObject( dc->hVisRgn ); + dc->dirty = 0; + dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); - return retval; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index d3843e6..f66e7d5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -514,7 +514,6 @@ # Wine extensions: Win16 functions that are needed by other dlls # @ stdcall GetDCHook(long ptr) -@ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) @@ -526,3 +525,4 @@ # GDI objects @ cdecl __wine_make_gdi_object_system(long long) +@ cdecl __wine_set_visible_region(long long ptr) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cd096cd..969c63e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -160,10 +160,7 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - /* map region to DC coordinates */ - OffsetRgn( vis_rgn, -win_rect.left, -win_rect.top ); - SelectVisRgn( dce->hdc, vis_rgn ); - DeleteObject( vis_rgn ); + __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d4075f..8c6367e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -384,8 +384,6 @@ static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xa HBRUSH SYSCOLOR_55AABrush = 0; -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); - static void SYSPARAMS_LogFont16To32W( const LOGFONT16 *font16, LPLOGFONTW font32 ) { diff --git a/include/wingdi.h b/include/wingdi.h index 53db856..3f5058f 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3790,7 +3790,10 @@ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); -WINGDIAPI INT WINAPI SelectVisRgn(HDC,HRGN); + +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINESRC__ */ #ifdef __cplusplus

1 0

Alexandre Julliard : gdi32: Get rid of the GetDCOrgEx driver entry point, GDI can implement this itself now.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f57c1b77dd5b9e56e6e103d632f26c0ddea6009b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57c1b77dd5b9e56e6e103d63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:36:01 2010 +0200 gdi32: Get rid of the GetDCOrgEx driver entry point, GDI can implement this itself now. --- dlls/gdi32/clipping.c | 7 ++----- dlls/gdi32/dc.c | 5 ++--- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/winex11.drv/graphics.c | 10 ---------- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 1 - 9 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 142c520..dfbc0ca 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -463,11 +463,8 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ if (iCode == SYSRGN && !(GetVersion() & 0x80000000)) - { - POINT org; - GetDCOrgEx( hDC, &org ); - OffsetRgn( hRgn, org.x, org.y ); - } + OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); + return (rgn != 0); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 738e42e..d122aae 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1068,9 +1068,8 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp ) if (!lpp) return FALSE; if (!(dc = get_dc_ptr( hDC ))) return FALSE; - - lpp->x = lpp->y = 0; - if (dc->funcs->pGetDCOrgEx) dc->funcs->pGetDCOrgEx( dc->physDev, lpp ); + lpp->x = dc->vis_rect.left; + lpp->y = dc->vis_rect.top; release_dc_ptr( dc ); return TRUE; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e6713ea..65eb048 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -109,7 +109,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(GdiComment); GET_FUNC(GetBitmapBits); GET_FUNC(GetCharWidth); - GET_FUNC(GetDCOrgEx); GET_FUNC(GetDIBColorTable); GET_FUNC(GetDIBits); GET_FUNC(GetDeviceCaps); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 115bb39..7e1c9b8 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -71,7 +71,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDCOrgEx */ NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8ac78ef..e09cf2b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -113,7 +113,6 @@ typedef struct tagDC_FUNCS BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,CONST BYTE*); LONG (CDECL *pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - BOOL (CDECL *pGetDCOrgEx)(PHYSDEV,LPPOINT); UINT (CDECL *pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*); INT (CDECL *pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f515bcf..810bd27 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -69,7 +69,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDCOrgEx */ NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 53cbab4..9cb509a 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1466,16 +1466,6 @@ X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color ) return color; } -/*********************************************************************** - * GetDCOrgEx (X11DRV.@) - */ -BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ) -{ - lpp->x = physDev->dc_rect.left + physDev->drawable_rect.left; - lpp->y = physDev->dc_rect.top + physDev->drawable_rect.top; - return TRUE; -} - static unsigned char *get_icm_profile( unsigned long *size ) { diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ab61f54..ffd90ad 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -17,7 +17,6 @@ @ cdecl ExtTextOut(ptr long long long ptr ptr long ptr) X11DRV_ExtTextOut @ cdecl GetBitmapBits(long ptr long) X11DRV_GetBitmapBits @ cdecl GetCharWidth(ptr long long ptr) X11DRV_GetCharWidth -@ cdecl GetDCOrgEx(ptr ptr) X11DRV_GetDCOrgEx @ cdecl GetDIBits(ptr long long long ptr ptr long) X11DRV_GetDIBits @ cdecl GetDeviceCaps(ptr long) X11DRV_GetDeviceCaps @ cdecl GetDeviceGammaRamp(ptr ptr) X11DRV_GetDeviceGammaRamp diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1cd610d..b8362fa 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -193,7 +193,6 @@ extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW pl extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ); extern BOOL CDECL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer ); -extern BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ); extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics);

1 0

Dmitry Timoshkov : winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: a56df96a0e6063a44c83ffd8fc330b1f92c02f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56df96a0e6063a44c83ffd8f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 23 22:21:58 2010 +0900 winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably. --- dlls/winex11.drv/keyboard.c | 10 +++++++--- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d9da4d2..02fd6bb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2541,9 +2541,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.state = 0; e.type = KeyPress; - focus = GetFocus(); - if (focus) focus = GetAncestor( focus, GA_ROOT ); - if (!focus) focus = GetActiveWindow(); + focus = x11drv_thread_data()->last_xic_hwnd; + if (!focus) + { + focus = GetFocus(); + if (focus) focus = GetAncestor( focus, GA_ROOT ); + if (!focus) focus = GetActiveWindow(); + } e.window = X11DRV_get_whole_window( focus ); xic = X11DRV_get_ic( focus ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index eb6432e..b3118cc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1862,6 +1862,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; + if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); @@ -2080,6 +2081,8 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; if (!data) return 0; + + x11drv_thread_data()->last_xic_hwnd = hwnd; if (data->xic) return data->xic; if (!(xim = x11drv_thread_data()->xim)) return 0; return X11DRV_CreateIC( xim, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b8362fa..4aaab35 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,6 +548,7 @@ struct x11drv_thread_data Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ + HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ HKL kbd_layout; /* active keyboard layout */

1 0