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

Vincent Povirk : shell32: Add test for SHCreateShellItem.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 026c37e747e642a6816b8b42583d32707fa994d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026c37e747e642a6816b8b425… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 21 11:19:21 2009 -0500 shell32: Add test for SHCreateShellItem. --- dlls/shell32/tests/shlfolder.c | 145 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0536d2e..0b5d7b2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -52,6 +52,9 @@ static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); +static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); + static void init_function_pointers(void) { @@ -68,6 +71,8 @@ static void init_function_pointers(void) pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); pILFree = (void*)GetProcAddress(hmod, (LPSTR)155); pILIsEqual = (void*)GetProcAddress(hmod, (LPSTR)21); + pSHCreateShellItem = (void*)GetProcAddress(hmod, "SHCreateShellItem"); + pILCombine = (void*)GetProcAddress(hmod, (LPSTR)25); hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); @@ -1740,6 +1745,142 @@ cleanup: RemoveDirectoryA(".\\testfolder"); } +static void test_SHCreateShellItem(void) +{ + IShellItem *shellitem; + IPersistIDList *persistidl; + LPITEMIDLIST pidl_cwd=NULL, pidl_testfile, pidl_abstestfile, pidl_test; + HRESULT ret; + char curdirA[MAX_PATH]; + WCHAR curdirW[MAX_PATH]; + IShellFolder *desktopfolder=NULL, *currentfolder=NULL; + static WCHAR testfileW[] = {'t','e','s','t','f','i','l','e',0}; + + GetCurrentDirectoryA(MAX_PATH, curdirA); + + if (!lstrlenA(curdirA)) + { + win_skip("GetCurrentDirectoryA returned empty string, skipping test_SHCreateShellItem\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); + + ret = SHGetDesktopFolder(&desktopfolder); + ok(SUCCEEDED(ret), "SHGetShellFolder returned %x\n", ret); + + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, curdirW, NULL, &pidl_cwd, NULL); + ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); + + ret = IShellFolder_BindToObject(desktopfolder, pidl_cwd, NULL, &IID_IShellFolder, (void**)&currentfolder); + ok(SUCCEEDED(ret), "BindToObject returned %x\n", ret); + + CreateTestFile(".\\testfile"); + + ret = IShellFolder_ParseDisplayName(currentfolder, NULL, NULL, testfileW, NULL, &pidl_testfile, NULL); + ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); + + pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + + ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); + todo_wine ok(ret == E_INVALIDARG, "SHCreateShellItem returned %x\n", ret); + + if (0) /* crashes on Windows XP */ + { + pSHCreateShellItem(NULL, NULL, pidl_cwd, NULL); + pSHCreateShellItem(pidl_cwd, NULL, NULL, &shellitem); + pSHCreateShellItem(NULL, currentfolder, NULL, &shellitem); + pSHCreateShellItem(pidl_cwd, currentfolder, NULL, &shellitem); + } + + ret = pSHCreateShellItem(NULL, NULL, pidl_cwd, &shellitem); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &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(shellitem); + } + + ret = pSHCreateShellItem(pidl_cwd, NULL, pidl_testfile, &shellitem); + todo_wine ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &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_abstestfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + + ret = pSHCreateShellItem(NULL, currentfolder, pidl_testfile, &shellitem); + todo_wine ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &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_abstestfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + + /* 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); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &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_abstestfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + + DeleteFileA(".\\testfile"); + pILFree(pidl_abstestfile); + pILFree(pidl_testfile); + pILFree(pidl_cwd); + IShellFolder_Release(currentfolder); + IShellFolder_Release(desktopfolder); +} START_TEST(shlfolder) { @@ -1762,6 +1903,10 @@ START_TEST(shlfolder) else skip("SHGetFolderPathAndSubDirA not present\n"); test_LocalizedNames(); + if(pSHCreateShellItem) + test_SHCreateShellItem(); + else + win_skip("test_SHCreateShellItem not present\n"); OleUninitialize(); }

1 0

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

22 May '09

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

Vincent Povirk : shell32: Handle parent folders in SHCreateShellItem.
by Alexandre Julliard 22 May '09

22 May '09

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 22 May '09

22 May '09

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: Implement ShellItem_GetAttributes.
by Alexandre Julliard 22 May '09

22 May '09

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

Alexandre Julliard : ntdll: Implemented RtlLookupFunctionEntry for x86_64.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 7634ce154a3c56aef1bca170c17bac7a5e5bce52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7634ce154a3c56aef1bca170c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 11:48:30 2009 +0200 ntdll: Implemented RtlLookupFunctionEntry for x86_64. --- dlls/ntdll/signal_x86_64.c | 50 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1c315d1..cc65dc8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -620,6 +620,31 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) /********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG64 pc, HMODULE module, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size/sizeof(*func) - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + if ((char *)pc < (char *)module + func[pos].BeginAddress) max = pos - 1; + else if ((char *)pc >= (char *)module + func[pos].EndAddress) min = pos + 1; + else + { + func += pos; + while (func->UnwindData & 1) /* follow chained entry */ + func = (RUNTIME_FUNCTION *)((char *)module + (func->UnwindData & ~1)); + return func; + } + } + return NULL; +} + +/********************************************************************** * call_stack_handlers * * Call the stack handlers chain. @@ -1019,11 +1044,28 @@ void signal_init_process(void) /********************************************************************** * RtlLookupFunctionEntry (NTDLL.@) */ -PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, - UNWIND_HISTORY_TABLE *table ) +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, UNWIND_HISTORY_TABLE *table ) { - FIXME("stub\n"); - return NULL; + LDR_MODULE *module; + RUNTIME_FUNCTION *func; + ULONG size; + + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)pc, &module )) + { + WARN( "module not found for %lx\n", pc ); + return NULL; + } + if (!(func = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc ); + return NULL; + } + func = find_function_info( pc, module->BaseAddress, func, size ); + if (func) *base = (ULONG64)module->BaseAddress; + return func; } static ULONG64 get_int_reg( CONTEXT *context, int reg )

1 0

Alexandre Julliard : shell32: Remove unnecessary linefeeds in traces.
by Alexandre Julliard 22 May '09

22 May '09

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 22 May '09

22 May '09

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::GetStart.
by Alexandre Julliard 22 May '09

22 May '09

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

Aric Stewart : msctf: Beginning implementation of ITfContext::GetEnd.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 7fa47cd3f50faf4c871c7a6a0e2c6f4651ffe76d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa47cd3f50faf4c871c7a6a0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 21 13:45:36 2009 -0500 msctf: Beginning implementation of ITfContext::GetEnd. --- dlls/msctf/context.c | 27 +++++++++++++++++++++++++-- dlls/msctf/tests/inputprocessor.c | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index ce5463f..8c83798 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -321,8 +321,31 @@ static HRESULT WINAPI Context_GetEnd (ITfContext *iface, TfEditCookie ec, ITfRange **ppEnd) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + EditCookie *cookie; + LONG end; + TRACE("(%p) %i %p\n",This,ec,ppEnd); + + if (!ppEnd) + return E_INVALIDARG; + + *ppEnd = NULL; + + 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); + ITextStoreACP_GetEndACP(This->pITextStoreACP,&end); + + return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, end, end, ppEnd); } static HRESULT WINAPI Context_GetActiveView (ITfContext *iface, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2fff504..f488e82 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -57,6 +57,7 @@ static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; 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_DoEditSession = SINK_UNEXPECTED; @@ -269,7 +270,8 @@ static HRESULT WINAPI TextStoreACP_RetrieveRequestedAttrs(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetEndACP(ITextStoreACP *iface, LONG *pacp) { - trace("\n"); + ok(test_ACP_GetEndACP == SINK_EXPECTED,"Unexpected TextStoreACP_GetEndACP\n"); + test_ACP_GetEndACP = SINK_FIRED; return S_OK; } static HRESULT WINAPI TextStoreACP_GetActiveView(ITextStoreACP *iface, @@ -1398,6 +1400,22 @@ TfEditCookie ec) ok(range != NULL,"Range set to NULL\n"); ITfRange_Release(range); + + hr = ITfContext_GetEnd(cxt,ec,NULL); + ok(hr == E_INVALIDARG,"Unexpected return code %x\n",hr); + + range = (ITfRange*)0xdeaddead; + hr = ITfContext_GetEnd(cxt,0xdeadcafe,&range); + ok(hr == TF_E_NOLOCK,"Unexpected return code %x\n",hr); + ok(range == NULL,"Range not set to NULL\n"); + + test_ACP_GetEndACP = SINK_EXPECTED; + hr = ITfContext_GetEnd(cxt,ec,&range); + ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); + ok(range != NULL,"Range set to NULL\n"); + ok(test_ACP_GetEndACP == SINK_FIRED, "GetEndACP not fired as expected\n"); + + ITfRange_Release(range); ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); return 0xdeadcafe;

1 0