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

Michael Stefaniuc : dmsynth/tests: Add COM tests for DMSynth and DMSynthSink.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 6f440bbad555ce2020c088cd4c6344d26e35c8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f440bbad555ce2020c088cd4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:52:25 2016 +0200 dmsynth/tests: Add COM tests for DMSynth and DMSynthSink. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 2d8e513..2035783 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -136,6 +136,99 @@ static void test_dmsynth(void) IDirectMusicSynth_Release(dmsynth); } +static void test_COM(void) +{ + IDirectMusicSynth8 *dms8 = (IDirectMusicSynth8*)0xdeadbeef; + IKsControl *iksc; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSynth, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSynth create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms8, "dms8 = %p\n", dms8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dms8); + ok(hr == E_NOINTERFACE, "DirectMusicSynth create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicSynth interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSynth8, (void**)&dms8); + ok(hr == S_OK, "DirectMusicSynth create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSynth8_AddRef(dms8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IKsControl, (void**)&iksc); + ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + refcount = IKsControl_AddRef(iksc); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + IKsControl_Release(iksc); + + hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + /* Unsupported interfaces */ + hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IDirectMusicSynthSink, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSynthSink failed: %08x\n", hr); + hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IReferenceClock, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); + + while (IDirectMusicSynth8_Release(dms8)); +} + +static void test_COM_synthsink(void) +{ + IDirectMusicSynthSink *dmss = (IDirectMusicSynthSink*)0xdeadbeef; + IKsControl *iksc; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, (IUnknown*)&dmss, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmss); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSynthSink create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmss, "dmss = %p\n", dmss); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmss); + ok(hr == E_NOINTERFACE, "DirectMusicSynthSink create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicSynthSink interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSynthSink, (void**)&dmss); + ok(hr == S_OK, "DirectMusicSynthSink create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSynthSink_AddRef(dmss); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IKsControl, (void**)&iksc); + ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + refcount = IKsControl_AddRef(iksc); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + IKsControl_Release(iksc); + + hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + /* Unsupported interfaces */ + hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IReferenceClock, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); + + while (IDirectMusicSynthSink_Release(dmss)); +} START_TEST(dmsynth) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -147,6 +240,8 @@ START_TEST(dmsynth) return; } test_dmsynth(); + test_COM(); + test_COM_synthsink(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmsynth: Lock/unlock the module only on creation/ desctruction.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 8ba03f8a986b439d3b5b46ce58be1333222c8155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba03f8a986b439d3b5b46ce5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:53:07 2016 +0200 dmsynth: Lock/unlock the module only on creation/desctruction. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 7 +++---- dlls/dmsynth/synthsink.c | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index fceeebd..88ba53e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -72,8 +72,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); - return ref; } @@ -88,10 +86,9 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) if (This->pLatencyClock) IReferenceClock_Release(This->pLatencyClock); HeapFree(GetProcessHeap(), 0, This); + DMSYNTH_UnlockModule(); } - DMSYNTH_UnlockModule(); - return ref; } @@ -605,7 +602,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; strcpyW(obj->pCaps.wszDescription, descrW); + DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); + return hr; } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 4720e59..7d148b0 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -67,8 +67,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK ifac TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); - return ref; } @@ -83,10 +81,9 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa if (This->latency_clock) IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); + DMSYNTH_UnlockModule(); } - DMSYNTH_UnlockModule(); - return ref; }

1 0

Michael Müller : kernel32/tests: Add tests for UnmapViewOfFile with unaligned pointer.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 38d49350072419fa38a5f376fe00ba5dcb9a6f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d49350072419fa38a5f376f… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 12:59:24 2016 +0200 kernel32/tests: Add tests for UnmapViewOfFile with unaligned pointer. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 37206b5..75d772b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -435,7 +435,7 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); - SetFilePointer( file, 4096, NULL, FILE_BEGIN ); + SetFilePointer( file, 12288, NULL, FILE_BEGIN ); SetEndOfFile( file ); /* read/write mapping */ @@ -994,6 +994,30 @@ static void test_MapViewOfFile(void) ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); ok(info.Type == 0, "%#x != 0\n", info.Type); + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 12288, NULL ); + ok( mapping != NULL, "CreateFileMappingA failed with error %u\n", GetLastError() ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 100 ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 4096 ); + todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + if (!ret) UnmapViewOfFile( ptr ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 4096 + 100 ); + todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + if (!ret) UnmapViewOfFile( ptr ); + + CloseHandle(mapping); CloseHandle(file); DeleteFileA(testfile); }

1 0

Michael Müller : ntdll: NtUnmapViewOfSection should succeed for all offsets within the mapped range.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 1311c8157be3e007b6de5a44df9171e940badb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1311c8157be3e007b6de5a44d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 12:59:55 2016 +0200 ntdll: NtUnmapViewOfSection should succeed for all offsets within the mapped range. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 ++---- dlls/ntdll/tests/info.c | 6 +++--- dlls/ntdll/virtual.c | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 75d772b..170ab7b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1007,15 +1007,13 @@ static void test_MapViewOfFile(void) ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); ret = UnmapViewOfFile( (char *)ptr + 4096 ); - todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); - if (!ret) UnmapViewOfFile( ptr ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); ret = UnmapViewOfFile( (char *)ptr + 4096 + 100 ); - todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); - if (!ret) UnmapViewOfFile( ptr ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); CloseHandle(mapping); CloseHandle(file); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index be355fb..19c7d66 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1643,7 +1643,7 @@ static void test_mapprotection(void) status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - size.u.LowPart = 0x1000; + size.u.LowPart = 0x2000; size.u.HighPart = 0; status = pNtCreateSection ( &h, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, @@ -1657,7 +1657,7 @@ static void test_mapprotection(void) offset.u.LowPart = 0; offset.u.HighPart = 0; - count = 0x1000; + count = 0x2000; addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -1680,7 +1680,7 @@ static void test_mapprotection(void) ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); - status = pNtUnmapViewOfSection (GetCurrentProcess(), addr); + status = pNtUnmapViewOfSection( GetCurrentProcess(), (char *)addr + 0x1050 ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 2e63b78..1e692c7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2737,7 +2737,6 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) struct file_view *view; NTSTATUS status = STATUS_NOT_MAPPED_VIEW; sigset_t sigset; - void *base = ROUND_ADDR( addr, page_mask ); if (process != NtCurrentProcess()) { @@ -2754,7 +2753,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, 0 )) && (base == view->base) && !(view->protect & VPROT_VALLOC)) + if ((view = VIRTUAL_FindView( addr, 0 )) && !(view->protect & VPROT_VALLOC)) { delete_view( view ); status = STATUS_SUCCESS;

1 0

Michael Müller : kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 1b26d38095e7d710375657b64db80c7c858ebea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b26d38095e7d710375657b64… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 13:00:30 2016 +0200 kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 37ab264..5733a42 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -576,7 +576,19 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, */ BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) { - NTSTATUS status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr ); + NTSTATUS status; + + if (GetVersion() & 0x80000000) + { + MEMORY_BASIC_INFORMATION info; + if (!VirtualQuery( addr, &info, sizeof(info) ) || info.AllocationBase != addr) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + } + + status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

Austin English : shell32: Add SHGetPropertyStoreForWindow stub.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: ebfe169c4389240dc57d3e1bcdc697e3ed4f5cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfe169c4389240dc57d3e1bc… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 19 00:20:07 2016 -0500 shell32: Add SHGetPropertyStoreForWindow stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 9 +++++++++ include/shellapi.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7ebd032..f95aaa7 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -390,6 +390,7 @@ @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr) +@ stdcall SHGetPropertyStoreForWindow(long ptr ptr) @ stdcall SHGetPropertyStoreFromParsingName(wstr ptr long ptr ptr) @ stdcall SHGetSettings(ptr long) @ stdcall SHGetSpecialFolderLocation(long long ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 74deecd..dce1896 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -943,6 +943,15 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) } /************************************************************************* + * SHGetPropertyStoreForWindow [SHELL32.@] + */ +HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) +{ + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); + return E_NOTIMPL; +} + +/************************************************************************* * SHGetPropertyStoreFromParsingName [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) diff --git a/include/shellapi.h b/include/shellapi.h index b94626f..d1aad6b 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -660,6 +660,7 @@ HRESULT WINAPI SHEnumerateUnreadMailAccountsA(HKEY,DWORD,LPSTR,INT); HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY,DWORD,LPWSTR,INT); #define SHEnumerateUnreadMailAccounts WINELIB_NAME_AW(SHEnumerateUnreadMailAccounts) +HRESULT WINAPI SHGetPropertyStoreForWindow(HWND,REFIID,void **); #ifdef __cplusplus } /* extern "C" */

1 0

Alex Henrie : include: Add FolderItems2 and FolderItems3.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 96072f4b6ab99c5d1214f78362a346859e262c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96072f4b6ab99c5d1214f7836… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:40 2016 -0600 include: Add FolderItems2 and FolderItems3. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shldisp.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/shldisp.idl b/include/shldisp.idl index 56be778..f5372c4 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -350,6 +350,36 @@ interface FolderItems : IDispatch } /***************************************************************************** + * FolderItems2 interface + */ +[ + uuid(c94f0ad0-f363-11d2-a327-00c04f8eec7f), + oleautomation, + dual +] +interface FolderItems2 : FolderItems +{ + HRESULT InvokeVerbEx( [in, optional] VARIANT verb, + [in, optional] VARIANT args ); +} + +/***************************************************************************** + * FolderItems3 interface + */ +[ + uuid(eaa7c309-bbec-49d5-821d-64d966cb667f), + oleautomation, + dual +] +interface FolderItems3 : FolderItems2 +{ + HRESULT Filter( [in] long flags, [in] BSTR spec ); + + [id(0), propget] + HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); +} + +/***************************************************************************** * FolderItemVerb interface */ [

1 0

Alex Henrie : shell32: Print RIIDs as strings in shell dispatch TRACE statements.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: ebf480c430c7d390b09386ceef0126c422ec229f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf480c430c7d390b09386cee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:41 2016 -0600 shell32: Print RIIDs as strings in shell dispatch TRACE statements. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 6dece6d..62c1bd3 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -176,7 +176,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, { FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); *ppv = NULL; @@ -248,7 +248,7 @@ static HRESULT WINAPI FolderItemVerbImpl_GetIDsOfNames(FolderItemVerb *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItemVerb_tid, &ti); @@ -265,7 +265,7 @@ static HRESULT WINAPI FolderItemVerbImpl_Invoke(FolderItemVerb *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItemVerb_tid, &ti); @@ -342,7 +342,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, { FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); *ppv = NULL; @@ -414,7 +414,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_GetIDsOfNames(FolderItemVerbs *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItemVerbs_tid, &ti); @@ -431,7 +431,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_Invoke(FolderItemVerbs *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItemVerbs_tid, &ti); @@ -592,7 +592,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, { FolderItemImpl *This = impl_from_FolderItem(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -665,7 +665,7 @@ static HRESULT WINAPI FolderItemImpl_GetIDsOfNames(FolderItem2 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItem2_tid, &ti); @@ -683,7 +683,7 @@ static HRESULT WINAPI FolderItemImpl_Invoke(FolderItem2 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItem2_tid, &ti); @@ -944,7 +944,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, { FolderImpl *This = impl_from_Folder(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1017,7 +1017,7 @@ static HRESULT WINAPI FolderImpl_GetIDsOfNames(Folder3 *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(Folder3_tid, &ti); @@ -1034,7 +1034,7 @@ static HRESULT WINAPI FolderImpl_Invoke(Folder3 *iface, DISPID dispIdMember, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(Folder3_tid, &ti); @@ -1289,7 +1289,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, { ShellDispatch *This = impl_from_IShellDispatch6(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1364,7 +1364,7 @@ static HRESULT WINAPI ShellDispatch_GetIDsOfNames(IShellDispatch6 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IShellDispatch6_tid, &ti); @@ -1382,7 +1382,7 @@ static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch6 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IShellDispatch6_tid, &ti);

1 0

Alex Henrie : shell32: Stub out FolderItems.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 1ed577384321596f0026faf9eb5e30b24797cfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed577384321596f0026faf9e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:42 2016 -0600 shell32: Stub out FolderItems. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 204 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 203 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 492f79f..0178e10 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -235,6 +235,7 @@ enum tid_t { IShellFolderViewDual3_tid, Folder3_tid, FolderItem2_tid, + FolderItems3_tid, FolderItemVerb_tid, FolderItemVerbs_tid, LAST_tid diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 62c1bd3..93c851f 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -48,6 +48,7 @@ static const IID * const tid_ids[] = &IID_IShellFolderViewDual3, &IID_Folder3, &IID_FolderItem2, + &IID_FolderItems3, &IID_FolderItemVerb, &IID_FolderItemVerbs }; @@ -65,6 +66,11 @@ typedef struct { } FolderImpl; typedef struct { + FolderItems3 FolderItems3_iface; + LONG ref; +} FolderItemsImpl; + +typedef struct { FolderItem2 FolderItem2_iface; LONG ref; VARIANT dir; @@ -97,6 +103,11 @@ static inline FolderImpl *impl_from_Folder(Folder3 *iface) return CONTAINING_RECORD(iface, FolderImpl, Folder3_iface); } +static inline FolderItemsImpl *impl_from_FolderItems(FolderItems3 *iface) +{ + return CONTAINING_RECORD(iface, FolderItemsImpl, FolderItems3_iface); +} + static inline FolderItemImpl *impl_from_FolderItem(FolderItem2 *iface) { return CONTAINING_RECORD(iface, FolderItemImpl, FolderItem2_iface); @@ -939,6 +950,196 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) return ret; } +static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, + REFIID riid, LPVOID *ppv) +{ + FolderItemsImpl *This = impl_from_FolderItems(iface); + + TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_FolderItems, riid) || + IsEqualIID(&IID_FolderItems2, riid) || + IsEqualIID(&IID_FolderItems3, riid)) + *ppv = &This->FolderItems3_iface; + else + { + FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI FolderItemsImpl_AddRef(FolderItems3 *iface) +{ + FolderItemsImpl *This = impl_from_FolderItems(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI FolderItemsImpl_Release(FolderItems3 *iface) +{ + FolderItemsImpl *This = impl_from_FolderItems(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static HRESULT WINAPI FolderItemsImpl_GetTypeInfoCount(FolderItems3 *iface, + UINT *count) +{ + TRACE("(%p,%p)\n", iface, count); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI FolderItemsImpl_GetTypeInfo(FolderItems3 *iface, + UINT type, LCID lcid, ITypeInfo **ppti) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, type, lcid, ppti); + + hr = get_typeinfo(FolderItems3_tid, ppti); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppti); + return hr; +} + +static HRESULT WINAPI FolderItemsImpl_GetIDsOfNames(FolderItems3 *iface, + REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), names, count, lcid, dispid); + + hr = get_typeinfo(FolderItems3_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, names, count, dispid); + return hr; +} + +static HRESULT WINAPI FolderItemsImpl_Invoke(FolderItems3 *iface, + DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *result, EXCEPINFO *ei, UINT *err) +{ + FolderItemsImpl *This = impl_from_FolderItems(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispid, shdebugstr_guid(riid), lcid, flags, params, result, ei, err); + + hr = get_typeinfo(FolderItems3_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, This, dispid, flags, params, result, ei, err); + return hr; +} + +static HRESULT WINAPI FolderItemsImpl_get_Count(FolderItems3 *iface, LONG *count) +{ + FIXME("(%p,%p)\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDispatch **ppid) +{ + FIXME("(%p,%p)\n", iface, ppid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) +{ + FIXME("(%p,%p)\n", iface, ppid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **ppid) +{ + FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **ppunk) +{ + FIXME("(%p,%p)\n", iface, ppunk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_InvokeVerbEx(FolderItems3 *iface, VARIANT verb, VARIANT args) +{ + FIXME("(%p,%s,%s)\n", iface, debugstr_variant(&verb), debugstr_variant(&args)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_Filter(FolderItems3 *iface, LONG flags, BSTR spec) +{ + FIXME("(%p,%d,%s)\n", iface, flags, wine_dbgstr_w(spec)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemVerbs **ppfic) +{ + FIXME("(%p,%p)\n", iface, ppfic); + + return E_NOTIMPL; +} + +static const FolderItems3Vtbl FolderItemsImpl_Vtbl = { + FolderItemsImpl_QueryInterface, + FolderItemsImpl_AddRef, + FolderItemsImpl_Release, + FolderItemsImpl_GetTypeInfoCount, + FolderItemsImpl_GetTypeInfo, + FolderItemsImpl_GetIDsOfNames, + FolderItemsImpl_Invoke, + FolderItemsImpl_get_Count, + FolderItemsImpl_get_Application, + FolderItemsImpl_get_Parent, + FolderItemsImpl_Item, + FolderItemsImpl__NewEnum, + FolderItemsImpl_InvokeVerbEx, + FolderItemsImpl_Filter, + FolderItemsImpl_get_Verbs +}; + +static HRESULT FolderItems_Constructor(FolderItems **ppfi) +{ + FolderItemsImpl *This; + + TRACE("\n"); + + *ppfi = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemsImpl)); + if (!This) return E_OUTOFMEMORY; + This->FolderItems3_iface.lpVtbl = &FolderItemsImpl_Vtbl; + This->ref = 1; + + *ppfi = (FolderItems*)&This->FolderItems3_iface; + return S_OK; +} + static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, LPVOID *ppv) { @@ -1093,8 +1294,7 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) { FIXME("(%p,%p)\n", iface, ppid); - *ppid = NULL; - return E_NOTIMPL; + return FolderItems_Constructor(ppid); } static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item)

1 0

Alex Henrie : shell32/tests: Add tests for FolderItems.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: ddf76f6a6691eeb6f9b05af457534d4f2abf2b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf76f6a6691eeb6f9b05af45… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:43 2016 -0600 shell32/tests: Add tests for FolderItems. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 134 ++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index dfcbe6d..c199549 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -31,6 +31,8 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; + static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); @@ -51,7 +53,6 @@ static void init_function_pointers(void) static void test_namespace(void) { - static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', @@ -307,6 +308,136 @@ static void test_namespace(void) IShellDispatch_Release(sd); } +static void test_items(void) +{ + WCHAR wstr[MAX_PATH], orig_dir[MAX_PATH]; + HRESULT r; + IShellDispatch *sd = NULL; + Folder *folder = NULL; + FolderItems *items = NULL; + FolderItems2 *items2 = NULL; + FolderItems3 *items3 = NULL; + FolderItem *item = (FolderItem*)0xdeadbeef; + IDispatch *disp = NULL; + IUnknown *unk = NULL; + FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef; + VARIANT var; + LONG lcount = -1; + + r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd); + ok(SUCCEEDED(r), "CoCreateInstance failed: %08x\n", r); + ok(!!sd, "sd is null\n"); + + GetTempPathW(MAX_PATH, wstr); + GetCurrentDirectoryW(MAX_PATH, orig_dir); + SetCurrentDirectoryW(wstr); + CreateDirectoryW(winetestW, NULL); + GetFullPathNameW(winetestW, MAX_PATH, wstr, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(wstr); + r = IShellDispatch_NameSpace(sd, var, &folder); + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + ok(!!folder, "folder is null\n"); + IShellDispatch_Release(sd); + SetCurrentDirectoryW(winetestW); + + r = Folder_Items(folder, &items); + ok(r == S_OK, "Folder::Items failed: %08x\n", r); + ok(!!items, "items is null\n"); + r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); + ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); + ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); + r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); + ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); + ok(!!items3, "items3 is null\n"); + Folder_Release(folder); + + if (0) /* crashes on all versions of Windows */ + r = FolderItems_get_Count(items, NULL); + + r = FolderItems_get_Count(items, &lcount); +todo_wine + ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); +todo_wine + ok(!lcount, "expected 0 files, got %d\n", lcount); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + + if (0) /* crashes on all versions of Windows */ + r = FolderItems_Item(items, var, NULL); + + r = FolderItems_Item(items, var, &item); +todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); +todo_wine + ok(!item, "item is not null\n"); + + if (0) /* crashes on xp */ + { + r = FolderItems_get_Application(items, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems_get_Application(items, &disp); +todo_wine + ok(r == S_OK, "FolderItems::get_Application failed: %08x\n", r); +todo_wine + ok(!!disp, "disp is null\n"); + if (disp) IDispatch_Release(disp); + + if (0) /* crashes on xp */ + { + r = FolderItems_get_Parent(items, NULL); + ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); + } + + disp = (IDispatch*)0xdeadbeef; + r = FolderItems_get_Parent(items, &disp); + ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); +todo_wine + ok(!disp, "disp is not null\n"); + + if (0) /* crashes on xp */ + { + r = FolderItems__NewEnum(items, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems__NewEnum(items, &unk); +todo_wine + ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); +todo_wine + ok(!!unk, "unk is null\n"); + if (unk) IUnknown_Release(unk); + + if (items3) + { + r = FolderItems3_Filter(items3, 0, NULL); +todo_wine + ok(r == S_OK, "expected S_OK, got %08x\n", r); + + if (0) /* crashes on xp */ + { + r = FolderItems3_get_Verbs(items3, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems3_get_Verbs(items3, &verbs); +todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); +todo_wine + ok(!verbs, "verbs is not null\n"); + } + + RemoveDirectoryW(winetestW); + SetCurrentDirectoryW(orig_dir); + + FolderItems_Release(items); + if (items2) FolderItems2_Release(items2); + if (items3) FolderItems3_Release(items3); +} + static void test_service(void) { static const WCHAR spooler[] = {'S','p','o','o','l','e','r',0}; @@ -880,6 +1011,7 @@ START_TEST(shelldispatch) init_function_pointers(); test_namespace(); + test_items(); test_service(); test_ShellFolderViewDual(); test_ShellWindows();

1 0