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

Rein Klazes : win87em.dll16: Remove a unnecessary floating point instruction that can cause invalid operation exceptions .
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: b0a40dafd9266c22dedd908d6e60ba0fdeed6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a40dafd9266c22dedd908d6… Author: Rein Klazes <wijn(a)online.nl> Date: Fri May 22 09:02:00 2009 +0200 win87em.dll16: Remove a unnecessary floating point instruction that can cause invalid operation exceptions. --- dlls/win87em.dll16/win87em.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index d3fc96a..6154ac6 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -149,7 +149,6 @@ void WINAPI _fpMath( CONTEXT *context ) case 6: /* round top of stack to integer using method AX & 0x0C00 */ /* returns current controlword */ { - DWORD dw=0; WORD save,mask; /* I don't know much about asm() programming. This could be * wrong. @@ -160,10 +159,8 @@ void WINAPI _fpMath( CONTEXT *context ) __asm__ __volatile__("orw $0xC00,%0" : "=m" (mask) : : "memory"); __asm__ __volatile__("fldcw %0;wait" : : "m" (mask)); __asm__ __volatile__("frndint"); - __asm__ __volatile__("fist %0;wait" : "=m" (dw) : : "memory"); __asm__ __volatile__("fldcw %0" : : "m" (save)); #endif - TRACE("On top of stack is %d\n",dw); } break;

1 0

Vincent Povirk : shell32: Implement ShellItem_GetAttributes.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: bced77fb076a26539074818a6d83448fa7342d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bced77fb076a26539074818a6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 21 13:24:32 2009 -0500 shell32: Implement ShellItem_GetAttributes. --- dlls/shell32/shellitem.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index ffd528b..13cb1f6 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -126,6 +126,27 @@ static HRESULT ShellItem_get_parent_pidl(ShellItem *This, LPITEMIDLIST *parent_p } } +static HRESULT ShellItem_get_parent_shellfolder(ShellItem *This, IShellFolder **ppsf) +{ + LPITEMIDLIST parent_pidl; + IShellFolder *desktop; + HRESULT ret; + + ret = ShellItem_get_parent_pidl(This, &parent_pidl); + if (SUCCEEDED(ret)) + { + ret = SHGetDesktopFolder(&desktop); + if (SUCCEEDED(ret)) + { + ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); + IShellFolder_Release(desktop); + } + ILFree(parent_pidl); + } + + return ret; +} + static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { @@ -167,11 +188,23 @@ static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnNam static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) { - FIXME("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); + ShellItem *This = (ShellItem*)iface; + IShellFolder *parent_folder; + LPITEMIDLIST child_pidl; + HRESULT ret; - *psfgaoAttribs = 0; + TRACE("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); - return E_NOTIMPL; + ret = ShellItem_get_parent_shellfolder(This, &parent_folder); + if (SUCCEEDED(ret)) + { + child_pidl = ILFindLastID(This->pidl); + *psfgaoAttribs = sfgaoMask; + ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); + IShellFolder_Release(parent_folder); + } + + return ret; } static HRESULT WINAPI ShellItem_Compare(IShellItem *iface, IShellItem *oth,

1 0

Nikolay Sivov : comctl32/tests: A bunch of ListView hittest tests.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 691aa6e267c8d1c8e17924f06997ddfc2fea5cf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691aa6e267c8d1c8e17924f06… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 22 00:57:30 2009 +0400 comctl32/tests: A bunch of ListView hittest tests. --- dlls/comctl32/tests/listview.c | 186 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1c002d9..d3e4ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -387,6 +387,89 @@ static HWND subclass_header(HWND hwndListview) return hwnd; } +/* Performs a single LVM_HITTEST test */ +static void test_lvm_hittest(HWND hwnd, INT x, INT y, INT item, UINT flags, + BOOL todo_item, BOOL todo_flags, int line) +{ + LVHITTESTINFO lpht; + DWORD ret; + + lpht.pt.x = x; + lpht.pt.y = y; + lpht.iSubItem = 10; + + trace("hittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); + ret = SendMessage(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); + + if (todo_item) + { + todo_wine + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); + } + } + else + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); + } + + if (todo_flags) + { + todo_wine + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); + } + else + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); +} + +/* Performs a single LVM_SUBITEMHITTEST test */ +static void test_lvm_subitemhittest(HWND hwnd, INT x, INT y, INT item, INT subitem, UINT flags, + BOOL todo_item, BOOL todo_subitem, BOOL todo_flags, int line) +{ + LVHITTESTINFO lpht; + DWORD ret; + + lpht.pt.x = x; + lpht.pt.y = y; + + trace("subhittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); + ret = SendMessage(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); + + if (todo_item) + { + todo_wine + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + } + } + else + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + } + + if (todo_subitem) + { + todo_wine + ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); + } + else + ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); + + if (todo_flags) + { + todo_wine + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); + } + else + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); +} + static void test_images(void) { HWND hwnd; @@ -2241,6 +2324,108 @@ static void test_setredraw(void) DestroyWindow(hwnd); } +static void test_hittest(void) +{ + HWND hwnd; + DWORD r; + RECT bounds; + LVITEMA item; + static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; + POINT pos; + INT x, y; + HIMAGELIST himl, himl2; + HBITMAP hbmp; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + /* LVS_REPORT with a single subitem (2 columns) */ + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + item.iSubItem = 0; + /* the only purpose of that line is to be as long as a half item rect */ + item.pszText = text; + r = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); + expect(TRUE, r); + + memset(&bounds, 0, sizeof(bounds)); + bounds.left = LVIR_BOUNDS; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); + ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); + ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); + expect(TRUE, r); + + /* LVS_EX_FULLROWSELECT not set, no icons attached */ + x = pos.x + 50; /* column half width */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMLABEL, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + x = pos.x + 150; /* outside column */ + 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__); + /* parent client area is 100x100 by default */ + MoveWindow(hwnd, 0, 0, 300, 100, FALSE); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* the same with LVS_EX_FULLROWSELECT */ + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + MoveWindow(hwnd, 0, 0, 100, 100, FALSE); + x = pos.x + 150; /* outside column */ + 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 */ + 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"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_IMAGE; + item.iImage = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + /* on state icon */ + x = pos.x + 8; /* outside column */ + 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__); + + himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + ok(himl2 == himl, "should return handle\n"); + + 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 */ + 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__); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2284,6 +2469,7 @@ START_TEST(listview) test_norecompute(); test_nosortheader(); test_setredraw(); + test_hittest(); DestroyWindow(hwndparent); }

1 0

Vincent Povirk : shell32: Handle parent folders in SHCreateShellItem.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 5b95a43d5e16ee7ae9674ffac1a5d794bc89b3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b95a43d5e16ee7ae9674ffac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 21 13:13:11 2009 -0500 shell32: Handle parent folders in SHCreateShellItem. --- dlls/shell32/shellitem.c | 33 +++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 6 +++--- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 08b2e24..50f0327 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -280,16 +280,41 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, { return E_INVALIDARG; } - else if (!pidlParent && !psfParent) + else if (pidlParent || psfParent) { - new_pidl = ILClone(pidl); + LPITEMIDLIST temp_parent=NULL; + if (!pidlParent) + { + IPersistFolder2* ppf2Parent; + + if (!SUCCEEDED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) + { + FIXME("couldn't get IPersistFolder2 interface of parent\n"); + return E_NOINTERFACE; + } + + if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) + { + FIXME("couldn't get parent PIDL\n"); + IPersistFolder2_Release(ppf2Parent); + return E_NOINTERFACE; + } + + pidlParent = temp_parent; + IPersistFolder2_Release(ppf2Parent); + } + + new_pidl = ILCombine(pidlParent, pidl); + ILFree(temp_parent); + if (!new_pidl) return E_OUTOFMEMORY; } else { - FIXME("(%p,%p,%p) not implemented\n", pidlParent, psfParent, pidl); - return E_NOINTERFACE; + new_pidl = ILClone(pidl); + if (!new_pidl) + return E_OUTOFMEMORY; } ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9c0c9a0..aed9f0e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1814,7 +1814,7 @@ static void test_SHCreateShellItem(void) } ret = pSHCreateShellItem(pidl_cwd, NULL, pidl_testfile, &shellitem); - todo_wine ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); if (SUCCEEDED(ret)) { ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); @@ -1834,7 +1834,7 @@ static void test_SHCreateShellItem(void) } ret = pSHCreateShellItem(NULL, currentfolder, pidl_testfile, &shellitem); - todo_wine ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); if (SUCCEEDED(ret)) { ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); @@ -1855,7 +1855,7 @@ static void test_SHCreateShellItem(void) /* if a parent pidl and shellfolder are specified, the shellfolder is ignored */ ret = pSHCreateShellItem(pidl_cwd, desktopfolder, pidl_testfile, &shellitem); - todo_wine ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); if (SUCCEEDED(ret)) { ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl);

1 0

Vincent Povirk : shell32: Implement IShellItem_GetParent.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 9eed85f0321c8ffc3142e5926a77eaaadcd4e381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eed85f0321c8ffc3142e5926… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 21 13:18:26 2009 -0500 shell32: Implement IShellItem_GetParent. --- dlls/shell32/shellitem.c | 36 +++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shlfolder.c | 23 ++++++++++++++++++++++- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 50f0327..ffd528b 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -105,6 +105,27 @@ static ULONG WINAPI ShellItem_Release(IShellItem *iface) return ref; } +static HRESULT ShellItem_get_parent_pidl(ShellItem *This, LPITEMIDLIST *parent_pidl) +{ + *parent_pidl = ILClone(This->pidl); + if (*parent_pidl) + { + if (ILRemoveLastID(*parent_pidl)) + return S_OK; + else + { + ILFree(*parent_pidl); + *parent_pidl = NULL; + return E_INVALIDARG; + } + } + else + { + *parent_pidl = NULL; + return E_OUTOFMEMORY; + } +} + static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { @@ -117,11 +138,20 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) { - FIXME("(%p,%p)\n", iface, ppsi); + ShellItem *This = (ShellItem*)iface; + LPITEMIDLIST parent_pidl; + HRESULT ret; - *ppsi = NULL; + TRACE("(%p,%p)\n", iface, ppsi); - return E_NOTIMPL; + ret = ShellItem_get_parent_pidl(This, &parent_pidl); + if (SUCCEEDED(ret)) + { + ret = SHCreateShellItem(NULL, NULL, parent_pidl, ppsi); + ILFree(parent_pidl); + } + + return ret; } static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnName, diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index aed9f0e..7900966 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1747,7 +1747,7 @@ cleanup: static void test_SHCreateShellItem(void) { - IShellItem *shellitem; + IShellItem *shellitem, *shellitem2; IPersistIDList *persistidl; LPITEMIDLIST pidl_cwd=NULL, pidl_testfile, pidl_abstestfile, pidl_test; HRESULT ret; @@ -1830,6 +1830,27 @@ static void test_SHCreateShellItem(void) } IPersistIDList_Release(persistidl); } + + ret = IShellItem_GetParent(shellitem, &shellitem2); + ok(SUCCEEDED(ret), "GetParent returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem2, &IID_IPersistIDList, (void**)&persistidl); + ok(SUCCEEDED(ret), "QueryInterface returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IPersistIDList_GetIDList(persistidl, &pidl_test); + ok(SUCCEEDED(ret), "GetIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem2); + } + IShellItem_Release(shellitem); }

1 0

Vincent Povirk : shell32: Fail properly when no pidl is passed to SHCreateShellItem.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 1d57a31d92983b2ef26752ba2fcee90978254c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d57a31d92983b2ef26752ba2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 21 11:24:29 2009 -0500 shell32: Fail properly when no pidl is passed to SHCreateShellItem. --- dlls/shell32/shellitem.c | 6 +++++- dlls/shell32/tests/shlfolder.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 643f1b5..08b2e24 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -276,7 +276,11 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); - if (!pidlParent && !psfParent && pidl) + if (!pidl) + { + return E_INVALIDARG; + } + else if (!pidlParent && !psfParent) { new_pidl = ILClone(pidl); if (!new_pidl) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0b5d7b2..9c0c9a0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1783,7 +1783,7 @@ static void test_SHCreateShellItem(void) pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); - todo_wine ok(ret == E_INVALIDARG, "SHCreateShellItem returned %x\n", ret); + ok(ret == E_INVALIDARG, "SHCreateShellItem returned %x\n", ret); if (0) /* crashes on Windows XP */ {

1 0

Aric Stewart : msctf: Beginning implementation of ITfContext::GetStart.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 6772a07a94fdc3fee7b99af5cae37e0727debc61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6772a07a94fdc3fee7b99af5c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 21 13:45:26 2009 -0500 msctf: Beginning implementation of ITfContext::GetStart. --- dlls/msctf/context.c | 18 ++++++++++++++++-- dlls/msctf/tests/inputprocessor.c | 24 ++++++++++++++++++++++++ include/msctf.idl | 3 +++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 1438d09..ce5463f 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -299,8 +299,22 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, TfEditCookie ec, ITfRange **ppStart) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + EditCookie *cookie; + TRACE("(%p) %i %p\n",This,ec,ppStart); + + if (!ppStart) + return E_INVALIDARG; + + *ppStart = NULL; + + if (!This->connected) + return TF_E_DISCONNECTED; + + if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) + return TF_E_NOLOCK; + + cookie = get_Cookie_data(ec); + return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, 0, 0, ppStart); } static HRESULT WINAPI Context_GetEnd (ITfContext *iface, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 11e7233..2fff504 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1373,9 +1373,33 @@ static ULONG WINAPI EditSession_Release(ITfEditSession *iface) static HRESULT WINAPI EditSession_DoEditSession(ITfEditSession *iface, TfEditCookie ec) { + ITfContext *cxt; + ITfDocumentMgr *dm; + ITfRange *range; + HRESULT hr; + ok(test_DoEditSession == SINK_EXPECTED, "Unexpected DoEditSession\n"); ok(test_ACP_RequestLock == SINK_FIRED,"Expected RequestLock not fired\n"); test_DoEditSession = SINK_FIRED; + + ITfThreadMgr_GetFocus(g_tm, &dm); + ITfDocumentMgr_GetTop(dm,&cxt); + + hr = ITfContext_GetStart(cxt,ec,NULL); + ok(hr == E_INVALIDARG,"Unexpected return code %x\n",hr); + + range = (ITfRange*)0xdeaddead; + hr = ITfContext_GetStart(cxt,0xdeadcafe,&range); + ok(hr == TF_E_NOLOCK,"Unexpected return code %x\n",hr); + ok(range == NULL,"Range not set to NULL\n"); + + hr = ITfContext_GetStart(cxt,ec,&range); + ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); + ok(range != NULL,"Range set to NULL\n"); + + ITfRange_Release(range); + ITfContext_Release(cxt); + ITfDocumentMgr_Release(dm); return 0xdeadcafe; } diff --git a/include/msctf.idl b/include/msctf.idl index 24be332..93f70c1 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -25,7 +25,10 @@ import "textstor.idl"; cpp_quote("#include <winuser.h>") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") +cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)") cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") +cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") + cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;")

1 0

Alexandre Julliard : shell32: Remove unnecessary linefeeds in traces.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 6562b25b9659b79a07c24dab800629428c42682e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6562b25b9659b79a07c24dab8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:17:26 2009 +0200 shell32: Remove unnecessary linefeeds in traces. --- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/debughlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cd087d2..949a439 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -160,7 +160,7 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); + TRACE("(%p)->(IID:%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 903ddcf..98d7899 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -430,7 +430,7 @@ const char * shdebugstr_guid( const struct _GUID *id ) name = clsidbuf; } - return wine_dbg_sprintf( "\n\t{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", + return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" );

1 0

Aric Stewart : msctf: Correct order of dwFlag checking to properly be able to set a ReadWrite lock .
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: a9c998ae90de302592a40a962ed631c9a565be65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c998ae90de302592a40a962… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 21 13:44:51 2009 -0500 msctf: Correct order of dwFlag checking to properly be able to set a ReadWrite lock. --- dlls/msctf/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 9733518..1438d09 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -243,10 +243,10 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, if (!(dwFlags & TF_ES_ASYNC)) dwLockFlags |= TS_LF_SYNC; - if (dwFlags & TF_ES_READ) - dwLockFlags |= TS_LF_READ; - else if ((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) + if ((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) dwLockFlags |= TS_LF_READWRITE; + else if (dwFlags & TF_ES_READ) + dwLockFlags |= TS_LF_READ; /* TODO: cache this */ ITextStoreACP_GetStatus(This->pITextStoreACP, &status);

1 0

Aric Stewart : msctf: Beginning implementation of ITfContext::GetSelection.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: 13d6aa2bb72d9d90e239d6e3001948ed0e2f9be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d6aa2bb72d9d90e239d6e30… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 21 13:45:57 2009 -0500 msctf: Beginning implementation of ITfContext::GetSelection. --- dlls/msctf/context.c | 55 +++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 23 +++++++++++++++- include/textstor.idl | 2 + 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 8c83798..8e14a72 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -283,8 +283,59 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, TF_SELECTION *pSelection, ULONG *pcFetched) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + EditCookie *cookie; + ULONG count, i; + ULONG totalFetched = 0; + HRESULT hr = S_OK; + + if (!pSelection || !pcFetched) + return E_INVALIDARG; + + *pcFetched = 0; + + if (!This->connected) + return TF_E_DISCONNECTED; + + if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) + return TF_E_NOLOCK; + + if (!This->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + cookie = get_Cookie_data(ec); + + if (ulIndex == TF_DEFAULT_SELECTION) + count = 1; + else + count = ulCount; + + for (i = 0; i < count; i++) + { + DWORD fetched; + TS_SELECTION_ACP acps; + + hr = ITextStoreACP_GetSelection(This->pITextStoreACP, ulIndex + i, + 1, &acps, &fetched); + + if (hr == TS_E_NOLOCK) + return TF_E_NOLOCK; + else if (SUCCEEDED(hr)) + { + pSelection[totalFetched].style.ase = acps.style.ase; + pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; + Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); + totalFetched ++; + } + else + break; + } + + *pcFetched = totalFetched; + + return hr; } static HRESULT WINAPI Context_SetSelection (ITfContext *iface, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f488e82..5884a30 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -58,6 +58,7 @@ static INT test_ACP_AdviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; +static INT test_ACP_GetSelection = SINK_UNEXPECTED; static INT test_DoEditSession = SINK_UNEXPECTED; @@ -171,7 +172,15 @@ static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetSelection(ITextStoreACP *iface, ULONG ulIndex, ULONG ulCount, TS_SELECTION_ACP *pSelection, ULONG *pcFetched) { - trace("\n"); + ok(test_ACP_GetSelection == SINK_EXPECTED, "Unexpected TextStoreACP_GetSelection\n"); + test_ACP_GetSelection = SINK_FIRED; + + pSelection->acpStart = 10; + pSelection->acpEnd = 20; + pSelection->style.fInterimChar = 0; + pSelection->style.ase = TS_AE_NONE; + *pcFetched = 1; + return S_OK; } static HRESULT WINAPI TextStoreACP_SetSelection(ITextStoreACP *iface, @@ -1378,6 +1387,8 @@ TfEditCookie ec) ITfContext *cxt; ITfDocumentMgr *dm; ITfRange *range; + TF_SELECTION selection; + ULONG fetched; HRESULT hr; ok(test_DoEditSession == SINK_EXPECTED, "Unexpected DoEditSession\n"); @@ -1416,6 +1427,16 @@ TfEditCookie ec) ok(test_ACP_GetEndACP == SINK_FIRED, "GetEndACP not fired as expected\n"); ITfRange_Release(range); + + selection.range = NULL; + test_ACP_GetSelection = SINK_EXPECTED; + hr = ITfContext_GetSelection(cxt, ec, TF_DEFAULT_SELECTION, 1, &selection, &fetched); + ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); + ok(fetched == 1,"fetched incorrect\n"); + ok(selection.range != NULL,"NULL range\n"); + ok(test_ACP_GetSelection == SINK_FIRED," expected ACP_GetSepection not fired\n"); + ITfRange_Release(selection.range); + ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); return 0xdeadcafe; diff --git a/include/textstor.idl b/include/textstor.idl index 262dc53..2e79e3c 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -21,6 +21,8 @@ import "oaidl.idl"; #endif cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TS_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") + const ULONG TS_DEFAULT_SELECTION = ~0u;

1 0