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

Andrew Eikum : kernel32: Support extended pathnames in GetShortPathName.
by Alexandre Julliard 06 May '15

06 May '15

Module: wine Branch: master Commit: 65f2690203089d55339cd2feca6e09b35dbc574a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f2690203089d55339cd2fec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 5 13:17:17 2015 -0500 kernel32: Support extended pathnames in GetShortPathName. --- dlls/kernel32/path.c | 28 +++++++++++++++++++++++----- dlls/kernel32/tests/path.c | 25 ++++++++++++++++++++----- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c2833b1..179c8e0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -440,7 +440,7 @@ DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) */ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortlen ) { - WCHAR tmpshortpath[MAX_PATHNAME_LEN]; + WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; @@ -460,12 +460,28 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl return 0; } + /* code below only removes characters from string, never adds, so this is + * the largest buffer that tmpshortpath will need to have */ + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + if (!tmpshortpath) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + if (longpath[0] == '\\' && longpath[1] == '\\' && longpath[2] == '?' && longpath[3] == '\\') + { + memcpy(tmpshortpath, longpath, 4 * sizeof(WCHAR)); + sp = lp = 4; + } + /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) + if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; + tmpshortpath[sp] = longpath[lp]; + tmpshortpath[sp + 1] = ':'; + sp += 2; + lp += 2; } while (longpath[lp]) @@ -522,9 +538,11 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen--; /* length without 0 */ } + HeapFree(GetProcessHeap(), 0, tmpshortpath); return tmplen; notfound: + HeapFree(GetProcessHeap(), 0, tmpshortpath); TRACE("not found!\n" ); SetLastError ( ERROR_FILE_NOT_FOUND ); return 0; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index cdb565a..de6d92a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1343,29 +1343,44 @@ static void test_GetLongPathNameW(void) static void test_GetShortPathNameW(void) { - WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; - WCHAR path[MAX_PATH]; + static const WCHAR extended_prefix[] = {'\\','\\','?','\\',0}; + static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; + static const WCHAR backSlash[] = { '\\', 0 }; + WCHAR path[MAX_PATH], tmppath[MAX_PATH]; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; int ret; - WCHAR name[] = { 't', 'e', 's', 't', 0 }; - WCHAR backSlash[] = { '\\', 0 }; SetLastError(0xdeadbeef); - GetTempPathW( MAX_PATH, path ); + GetTempPathW( MAX_PATH, tmppath ); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetTempPathW is not implemented\n"); return; } + lstrcpyW( path, tmppath ); lstrcatW( path, test_path ); lstrcatW( path, backSlash ); ret = CreateDirectoryW( path, NULL ); ok( ret, "Directory was not created. LastError = %d\n", GetLastError() ); /* Starting a main part of test */ + + /* extended path \\?\C:\path\ */ + lstrcpyW( path, extended_prefix ); + lstrcatW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); + short_path[0] = 0; + length = GetShortPathNameW( path, short_path, sizeof(short_path) / sizeof(*short_path) ); + ok( length, "GetShortPathNameW returned 0.\n" ); + + lstrcpyW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length );

1 0

Jacek Caban : mshtml: Split getAttribute into helper function and use it in IHTMLDOMAttribute:: get_nodeValue implementation.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 8e0d6619276f3c139defc9461c294a49022d9fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0d6619276f3c139defc9461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:13 2015 +0200 mshtml: Split getAttribute into helper function and use it in IHTMLDOMAttribute::get_nodeValue implementation. --- dlls/mshtml/htmlattr.c | 6 +---- dlls/mshtml/htmlelem.c | 59 +++++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 6 +++++ 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 8359847..bd0630e 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -164,8 +164,6 @@ static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, V static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - DISPPARAMS dp = {NULL, NULL, 0, 0}; - EXCEPINFO ei; TRACE("(%p)->(%p)\n", This, p); @@ -174,9 +172,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V return E_UNEXPECTED; } - memset(&ei, 0, sizeof(ei)); - return IDispatchEx_InvokeEx(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dp, p, &ei, NULL); + return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); } static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d2e9f27..c70786b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -606,10 +606,6 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } -#define ATTRFLAG_CASESENSITIVE 0x0001 -#define ATTRFLAG_ASSTRING 0x0002 -#define ATTRFLAG_EXPANDURL 0x0004 - static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { @@ -640,14 +636,42 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); } +HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD flags, VARIANT *ret) +{ + DISPPARAMS dispParams = {NULL, NULL, 0, 0}; + EXCEPINFO excep; + HRESULT hres; + + hres = IDispatchEx_InvokeEx(&elem->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); + if(FAILED(hres)) + return hres; + + if(flags & ATTRFLAG_ASSTRING) { + switch(V_VT(ret)) { + case VT_BSTR: + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(ret)); + V_VT(ret) = VT_BSTR; + V_BSTR(ret) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(ret, ret, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; +} + static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement(iface); DISPID dispid; HRESULT hres; - DISPPARAMS dispParams = {NULL, NULL, 0, 0}; - EXCEPINFO excep; TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); @@ -666,28 +690,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); - if(FAILED(hres)) - return hres; - - if(lFlags & ATTRFLAG_ASSTRING) { - switch(V_VT(AttributeValue)) { - case VT_BSTR: - break; - case VT_DISPATCH: - IDispatch_Release(V_DISPATCH(AttributeValue)); - V_VT(AttributeValue) = VT_BSTR; - V_BSTR(AttributeValue) = SysAllocString(NULL); - break; - default: - hres = VariantChangeType(AttributeValue, AttributeValue, 0, VT_BSTR); - if(FAILED(hres)) - return hres; - } - } - - return S_OK; + return get_elem_attr_value_by_dispid(This, dispid, lFlags, AttributeValue); } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 22b8397..cc1d27b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -976,6 +976,12 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; + +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + +HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,DWORD,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2::get_value implementation.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 985d8afcd14ad0d94a70adae81e46886e00b3f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985d8afcd14ad0d94a70adae8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:19 2015 +0200 mshtml: Added IHTMLDOMAttribute2::get_value implementation. --- dlls/mshtml/htmlattr.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index bd0630e..861a594 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -303,8 +303,25 @@ static HRESULT WINAPI HTMLDOMAttribute2_put_value(IHTMLDOMAttribute2 *iface, BST static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BSTR *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + VARIANT val; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, ATTRFLAG_ASSTRING, &val); + if(FAILED(hres)) + return hres; + + assert(V_VT(&val) == VT_BSTR); + *p = V_BSTR(&val); + if(!*p && !(*p = SysAllocStringLen(NULL, 0))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c8ab19d..3e83e64 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1806,6 +1806,24 @@ static void _test_attr_expando(unsigned line, IHTMLDOMAttribute *attr, VARIANT_B IHTMLDOMAttribute2_Release(attr2); } +#define test_attr_value(a,b) _test_attr_value(__LINE__,a,b) +static void _test_attr_value(unsigned line, IHTMLDOMAttribute *attr, const char *exval) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + BSTR val; + HRESULT hres; + + hres = IHTMLDOMAttribute2_get_value(attr2, &val); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(val, exval), "value = %s, expected %s\n", wine_dbgstr_w(val), exval); + else + ok_(__FILE__,line)(!val, "value = %s, expected NULL\n", wine_dbgstr_w(val)); + + IHTMLDOMAttribute2_Release(attr2); + SysFreeString(val); +} + #define test_comment_attrs(c) _test_comment_attrs(__LINE__,c) static void _test_comment_attrs(unsigned line, IUnknown *unk) { @@ -3251,6 +3269,7 @@ static void test_attr_collection(IHTMLElement *elem) ok(V_VT(&val) == VT_BSTR, "id: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr"), "id: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_FALSE); + test_attr_value(dom_attr, "attr"); } else if(!strcmp_wa(name, "attr1")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); @@ -3258,24 +3277,28 @@ static void test_attr_collection(IHTMLElement *elem) ok(V_VT(&val) == VT_BSTR, "attr1: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr1"), "attr1: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_TRUE); + test_attr_value(dom_attr, "attr1"); } else if(!strcmp_wa(name, "attr2")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr2: V_VT(&val) = %d\n", V_VT(&val)); ok(!V_BSTR(&val), "attr2: V_BSTR(&val) != NULL\n"); + test_attr_value(dom_attr, ""); } else if(!strcmp_wa(name, "attr3")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr3: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr3"), "attr3: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); + test_attr_value(dom_attr, "attr3"); } else if(!strcmp_wa(name, "test")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_I4, "test: V_VT(&val) = %d\n", V_VT(&val)); ok(V_I4(&val) == 1, "test: V_I4(&val) = %d\n", V_I4(&val)); + test_attr_value(dom_attr, "1"); } IHTMLDOMAttribute_Release(dom_attr);

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_returnValue implementation.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 71cae1fcebb6d0cb78279e81b28caf663c5a9b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cae1fcebb6d0cb78279e81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:25 2015 +0200 mshtml: Added IHTMLEventObj::get_returnValue implementation. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 30ce6b1..1687aba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -265,6 +265,7 @@ typedef struct { HTMLDOMNode *target; const event_info_t *type; nsIDOMEvent *nsevent; + VARIANT return_value; BOOL prevent_default; BOOL cancel_bubble; } HTMLEventObj; @@ -469,6 +470,7 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT return DISP_E_BADVARTYPE; } + This->return_value = v; if(!V_BOOL(&v)) This->prevent_default = TRUE; return S_OK; @@ -478,10 +480,9 @@ static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_EMPTY; - return S_OK; + return VariantCopy(p, &This->return_value); } static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index e3e7f72..11a91da 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1057,6 +1057,7 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { IHTMLEventObj *event; + VARIANT v; HRESULT hres; CHECK_EXPECT(submit_onclick_setret); @@ -1068,10 +1069,20 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID ok(hres == S_OK, "get_event failed: %08x\n", hres); ok(event != NULL, "event == NULL\n"); + V_VT(&v) = VT_ERROR; + hres = IHTMLEventObj_get_returnValue(event, &v); + ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(returnValue) = %d\n", V_VT(&v)); + hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); IHTMLEventObj_Release(event); + V_VT(&v) = VT_ERROR; + hres = IHTMLEventObj_get_returnValue(event, &v); + ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(VarCmp(&v, &onclick_event_retval, 0, 0) == VARCMP_EQ, "unexpected returnValue\n"); + *pvarRes = onclick_retval; return S_OK; }

1 0

Nikolay Sivov : shell32/tests: A test for shellview QI for IOleWindow.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a7b99a1f892693985f608b9286ab863763a88592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b99a1f892693985f608b928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:01:59 2015 +0300 shell32/tests: A test for shellview QI for IOleWindow. --- dlls/shell32/tests/shlview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 2d323d9..cab0630 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -938,6 +938,7 @@ static void test_IOleWindow(void) { IShellFolder *desktop; IShellView *view; + IOleWindow *wnd; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -946,6 +947,9 @@ static void test_IOleWindow(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); + ok(hr == E_NOINTERFACE, "got (0x%08x)\n", hr); + /* IShellView::ContextSensitiveHelp */ hr = IShellView_ContextSensitiveHelp(view, TRUE); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);

1 0

Nikolay Sivov : shell32: Fix multiline trace message and some magic numbers.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a897adb67b967a8e2245e167a9ea5753e3af3183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a897adb67b967a8e2245e167a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:03:33 2015 +0300 shell32: Fix multiline trace message and some magic numbers. --- dlls/shell32/shlview.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d6c427e..f0e153c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2249,19 +2249,20 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( { IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", - This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); + FIXME("(%p)->(%s %d 0x%08x %s %p)\n", + This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); if (!pguidCmdGroup) return OLECMDERR_E_UNKNOWNGROUP; + if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && - (nCmdID == 0x29) && + (nCmdID == OLECMDID_SHOWMESSAGE) && (nCmdexecopt == 4) && pvaOut) return S_OK; if (IsEqualIID(pguidCmdGroup, &CGID_ShellDocView) && - (nCmdID == 9) && - (nCmdexecopt == 0)) - return 1; + (nCmdID == OLECMDID_SPELL) && + (nCmdexecopt == OLECMDEXECOPT_DODEFAULT)) + return S_FALSE; return OLECMDERR_E_UNKNOWNGROUP; }

1 0

Nikolay Sivov : shell32: Forward AutoArrange() to IFolderView2.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 7e0e82bc9c4d598cce883af232d2efdcc7bfe9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0e82bc9c4d598cce883af23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:20:45 2015 +0300 shell32: Forward AutoArrange() to IFolderView2. --- dlls/shell32/shlview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f0e153c..549ba01 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3145,8 +3145,8 @@ static HRESULT WINAPI IShellFolderView_fnArrangeGrid(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnAutoArrange(IShellFolderView *iface) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return IFolderView2_SetCurrentFolderFlags(&This->IFolderView2_iface, FWF_AUTOARRANGE, FWF_AUTOARRANGE); } static HRESULT WINAPI IShellFolderView_fnGetAutoArrange(IShellFolderView *iface)

1 0

Nikolay Sivov : shell32: Forward SetRedraw to IFolderView2.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: be6e022f2d740b06992a0031aad6f19cde906834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6e022f2d740b06992a0031a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:22:28 2015 +0300 shell32: Forward SetRedraw to IFolderView2. --- dlls/shell32/shlview.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 549ba01..1676996 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -625,7 +625,7 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) static HRESULT ShellView_FillList(IShellViewImpl *This) { - IShellFolderView *folderview = &This->IShellFolderView_iface; + IFolderView2 *folderview = &This->IFolderView2_iface; LPENUMIDLIST pEnumIDList; LPITEMIDLIST pidl; DWORD fetched; @@ -658,9 +658,9 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) /* sort the array */ DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); - IShellFolderView_SetRedraw(folderview, FALSE); + IFolderView2_SetRedraw(folderview, FALSE); DPA_DestroyCallback(hdpa, fill_list, This); - IShellFolderView_SetRedraw(folderview, TRUE); + IFolderView2_SetRedraw(folderview, TRUE); IEnumIDList_Release(pEnumIDList); @@ -3038,8 +3038,9 @@ static HRESULT WINAPI FolderView2_GetGroupSubsetCount(IFolderView2 *iface, UINT static HRESULT WINAPI FolderView2_SetRedraw(IFolderView2 *iface, BOOL redraw) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(%d), stub\n", This, redraw); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, redraw); + SendMessageW(This->hWndList, WM_SETREDRAW, redraw, 0); + return S_OK; } static HRESULT WINAPI FolderView2_IsMoveInSameFolder(IFolderView2 *iface) @@ -3245,10 +3246,7 @@ static HRESULT WINAPI IShellFolderView_fnSetRedraw( { IShellViewImpl *This = impl_from_IShellFolderView(iface); TRACE("(%p)->(%d)\n", This, redraw); - - SendMessageW(This->hWndList, WM_SETREDRAW, redraw, 0); - - return S_OK; + return IFolderView2_SetRedraw(&This->IFolderView2_iface, redraw); } static HRESULT WINAPI IShellFolderView_fnGetSelectedCount(

1 0

Nikolay Sivov : shell32: Implement GetSelectedCount() using IFolderView2:: GetSelection().
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a6163247cd10e789f71db547c20233ceb5d88a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6163247cd10e789f71db547c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:29:21 2015 +0300 shell32: Implement GetSelectedCount() using IFolderView2::GetSelection(). --- dlls/shell32/shlview.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1676996..8352157 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3254,8 +3254,19 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedCount( UINT *count) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p) stub\n", This, count); - return E_NOTIMPL; + IShellItemArray *selection; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, count); + + *count = 0; + hr = IFolderView2_GetSelection(&This->IFolderView2_iface, FALSE, &selection); + if (FAILED(hr)) + return hr; + + hr = IShellItemArray_GetCount(selection, count); + IShellItemArray_Release(selection); + return hr; } static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects(

1 0

Nikolay Sivov : explorer: Added IDispatch support for IShellWindows.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: d1e309abe2b7790f7a62c2536ce409200bcf9455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e309abe2b7790f7a62c2536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 22:27:44 2015 +0300 explorer: Added IDispatch support for IShellWindows. --- programs/explorer/desktop.c | 51 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 03008f4..7ee6174 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -67,13 +67,13 @@ static unsigned int nb_launchers, nb_allocated; static REFIID tid_ids[] = { - &IID_NULL, + &IID_IShellWindows, &IID_IWebBrowser2 }; typedef enum { - NULL_tid, + IShellWindows_tid, IWebBrowser2_tid, LAST_tid } tid_t; @@ -1071,24 +1071,39 @@ static ULONG WINAPI shellwindows_Release(IShellWindows *iface) static HRESULT WINAPI shellwindows_GetTypeInfoCount(IShellWindows *iface, UINT *pctinfo) { - FIXME("%p\n", pctinfo); - return E_NOTIMPL; + TRACE("%p\n", pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI shellwindows_GetTypeInfo(IShellWindows *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("%u 0x%x %p\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%d %d %p\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IShellWindows_tid, ppTInfo); } static HRESULT WINAPI shellwindows_GetIDsOfNames(IShellWindows *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("%s %p %u 0x%x %p\n", debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%s %p %d %d %p\n", debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if (!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, @@ -1096,9 +1111,21 @@ static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("0x%x %s 0x%x 0x%x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%d %s %d %08x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_get_Count(IShellWindows *iface, LONG *count)

1 0