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

Jacek Caban : mshtml: Store external script text in HTMLScriptElement object.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: f73f884884b74d20f6068a99c5e8c53ef91ce276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73f884884b74d20f6068a99c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:39:47 2016 +0200 mshtml: Store external script text in HTMLScriptElement object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 9 ++++++++- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 12 +++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 9feb551..0a2d67a 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -391,6 +391,13 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLScriptElement_destructor(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + heap_free(This->src_text); + HTMLElement_destructor(&This->element.node); +} + static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -439,7 +446,7 @@ static void HTMLScriptElement_unlink(HTMLDOMNode *iface) static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, - HTMLElement_destructor, + HTMLScriptElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index ad493c9..4e40f63 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -26,6 +26,7 @@ typedef struct { BOOL parse_on_bind; BOOL pending_readystatechange_event; READYSTATE readystate; + WCHAR *src_text; /* sctipt text downloaded from src */ } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 582c9af..3503e69 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -866,22 +866,20 @@ static void script_file_available(ScriptBSC *bsc) HTMLScriptElement *script_elem = bsc->script_elem; HTMLInnerWindow *window = bsc->bsc.window; ScriptHost *script_host; - WCHAR *text; HRESULT hres; - hres = get_binding_text(bsc, &text); + assert(window != NULL); + + hres = get_binding_text(bsc, &script_elem->src_text); if(FAILED(hres)) return; script_host = get_elem_script_host(window, script_elem); - if(!script_host) { - heap_free(text); + if(!script_host) return; - } script_elem->parsed = TRUE; - parse_elem_text(script_host, script_elem, text); - heap_free(text); + parse_elem_text(script_host, script_elem, script_elem->src_text); } static inline ScriptBSC *impl_from_BSCallback(BSCallback *iface)

1 0

Jacek Caban : mshtml: Merge parse_extern_script and bind_script.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: eeb075dd0e38615f2e1ac9e62adf11f3b3105a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb075dd0e38615f2e1ac9e62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:40:04 2016 +0200 mshtml: Merge parse_extern_script and bind_script. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3503e69..ab9be3b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -997,12 +997,30 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem) +static HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src) { + HTMLInnerWindow *window; ScriptBSC *bsc; IMoniker *mon; + IUri *uri; HRESULT hres; + static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; + + if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) + src += sizeof(wine_schemaW)/sizeof(WCHAR); + + TRACE("(%p %s)\n", script_elem, debugstr_w(src)); + + if(!script_elem->element.node.doc || !(window = script_elem->element.node.doc->window)) { + ERR("no window\n"); + return E_UNEXPECTED; + } + + hres = create_uri(src, 0, &uri); + if(FAILED(hres)) + return hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); if(FAILED(hres)) return hres; @@ -1029,24 +1047,6 @@ static HRESULT bind_script(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement return hres; } -static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) -{ - IUri *uri; - HRESULT hres; - - static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; - - if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) - src += sizeof(wine_schemaW)/sizeof(WCHAR); - - hres = create_uri(src, 0, &uri); - if(FAILED(hres)) - return; - - hres = bind_script(script_host->window, uri, script_elem); - IUri_Release(uri); -} - static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) { const PRUnichar *text; @@ -1095,7 +1095,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { - parse_extern_script(script_host, script_elem, src); + load_script(script_elem, src); }else { parse_inline_script(script_host, script_elem); }

1 0

Alex Henrie : shell32: Set output interfaces to NULL in FolderItems functions.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: a71128513767d44a8f42e10895578b650061bdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71128513767d44a8f42e1089… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:45 2016 -0600 shell32: Set output interfaces to NULL in FolderItems functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 9 ++++++++- dlls/shell32/tests/shelldispatch.c | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 0c1662d..ac79302 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1063,12 +1063,16 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp if (!ppid) return E_INVALIDARG; + *ppid = NULL; return E_NOTIMPL; } static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, ppid); + + if (ppid) + *ppid = NULL; return E_NOTIMPL; } @@ -1077,6 +1081,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F { FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); + *ppid = NULL; return E_NOTIMPL; } @@ -1087,6 +1092,7 @@ static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **p if (!ppunk) return E_INVALIDARG; + *ppunk = NULL; return E_NOTIMPL; } @@ -1111,6 +1117,7 @@ static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemV if (!ppfic) return E_INVALIDARG; + *ppfic = NULL; return E_NOTIMPL; } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index c199549..1f50277 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -370,7 +370,6 @@ todo_wine 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 */ @@ -395,7 +394,6 @@ todo_wine 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 */ @@ -426,7 +424,6 @@ todo_wine 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"); }

1 0

Austin English : shell32: Add SHGetPropertyStoreForWindow stub.
by Alexandre Julliard July 19, 2016

July 19, 2016

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

Michael Stefaniuc : dmsynth/tests: Add COM tests for DMSynth and DMSynthSink.
by Alexandre Julliard July 19, 2016

July 19, 2016

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/tests: Move the dll availability check to a separate function.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 45c1f7d3ed33c7037358f94e7342324657f696d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c1f7d3ed33c7037358f94e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:51:36 2016 +0200 dmsynth/tests: Move the dll availability check to a separate function. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ba094a1..2d8e513 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -30,6 +30,20 @@ #include "dmusici.h" #include "dmksctrl.h" +static BOOL missing_dmsynth(void) +{ + IDirectMusicSynth *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSynth, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicSynth_Release(dms); + return FALSE; + } + return TRUE; +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -44,11 +58,7 @@ static void test_dmsynth(void) ULONG bytes; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); - if (hr != S_OK) - { - skip("Cannot create DirectMusicSync object (%x)\n", hr); - return; - } + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); @@ -130,6 +140,12 @@ START_TEST(dmsynth) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmsynth()) + { + skip("dmsynth not available\n"); + CoUninitialize(); + return; + } test_dmsynth(); CoUninitialize();

1 0

Józef Kucia : wined3d: Add ARB_vertex_type_2_10_10_10_rev extension.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 57d2b83d0d2221aecd71345078a5f7ca5463869a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d2b83d0d2221aecd7134507… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:34 2016 +0200 wined3d: Add ARB_vertex_type_2_10_10_10_rev extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d80752..dc41c7e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -168,6 +168,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, + {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, /* ATI */ {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER }, @@ -3543,6 +3544,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_RGB10_A2UI, MAKEDWORD_VERSION(3, 3)}, {ARB_TEXTURE_SWIZZLE, MAKEDWORD_VERSION(3, 3)}, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, + {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a0d80fa..828acf4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -103,6 +103,7 @@ enum wined3d_gl_extension ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, + ARB_VERTEX_TYPE_2_10_10_10_REV, /* ATI */ ATI_FRAGMENT_SHADER, ATI_SEPARATE_STENCIL,

1 0

Alex Henrie : shell32/tests: Add tests for FolderItems.
by Alexandre Julliard July 19, 2016

July 19, 2016

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

Alex Henrie : shell32: Stub out FolderItems.
by Alexandre Julliard July 19, 2016

July 19, 2016

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: Print RIIDs as strings in shell dispatch TRACE statements.
by Alexandre Julliard July 19, 2016

July 19, 2016

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