August 2015 - Wine-Commits - list.winehq.org

Gerald Pfeifer : d3dcompiler_43: Define BWRITER_SM1_VS and BWRITER_SM1_PS as unsigned constants.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 8bb4525ee03494003efd0e346b296f75e34a0cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4525ee03494003efd0e346… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 10 12:31:25 2015 +0200 d3dcompiler_43: Define BWRITER_SM1_VS and BWRITER_SM1_PS as unsigned constants. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2fafa94..1eea0d2 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -532,8 +532,8 @@ enum bwritershader_param_srcmod_type BWRITERSPSM_NOT, }; -#define BWRITER_SM1_VS 0xfffe -#define BWRITER_SM1_PS 0xffff +#define BWRITER_SM1_VS 0xfffeu +#define BWRITER_SM1_PS 0xffffu #define BWRITERPS_VERSION(major, minor) ((BWRITER_SM1_PS << 16) | ((major) << 8) | (minor)) #define BWRITERVS_VERSION(major, minor) ((BWRITER_SM1_VS << 16) | ((major) << 8) | (minor))

1 0

Sebastian Lackner : d3dcompiler: Implement semi-stub for D3DCompile2.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: e0a9ea6c684a6579b5deafc4cd6383e247b81079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a9ea6c684a6579b5deafc4c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 29 17:58:02 2015 +0200 d3dcompiler: Implement semi-stub for D3DCompile2. --- dlls/d3dcompiler_43/compiler.c | 28 ++++++++++++++++++++++++---- dlls/d3dcompiler_46/d3dcompiler_46.spec | 2 +- dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 5dce856..33ef916 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -692,16 +692,23 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return S_OK; } -HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, - const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages) { HRESULT hr; TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n" + "secondary_data_size %lu, shader %p, error_messages %p\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), - debugstr_a(target), sflags, eflags, shader, error_messages); + debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, + secondary_data_size, shader, error_messages); + + if (secondary_data) + FIXME("secondary data not implemented yet\n"); if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; @@ -717,6 +724,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena return hr; } +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) +{ + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(target), sflags, eflags, shader, error_messages); + + return D3DCompile2(data, data_size, filename, defines, include, entrypoint, target, sflags, + eflags, 0, NULL, 0, shader, error_messages); +} + HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages) diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index e36a8c0..1b145c8a 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) -@ stub D3DCompile2 +@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr) @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index a0df93e..efa4767 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) -@ stub D3DCompile2 +@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr) @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr)

1 0

Jacek Caban : ieframe: Added support for DownloadBegin and DownloadComplete events.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 37c8166b8a80e6f3b11ba1464e9ec6d7e75ed07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c8166b8a80e6f3b11ba1464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:30:57 2015 +0200 ieframe: Added support for DownloadBegin and DownloadComplete events. --- dlls/ieframe/dochost.c | 7 +++++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 8 ++++++++ dlls/ieframe/tests/webbrowser.c | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 55c1dfe..3c7afb6 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -646,8 +646,11 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(This->olecmd) return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - FIXME("Default action not implemented.\n"); - return E_NOTIMPL; + if(!pvaIn || V_VT(pvaIn) != VT_I4) + return E_INVALIDARG; + + notify_download_state(This, V_I4(pvaIn)); + return S_OK; default: FIXME("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 031cfae..057c2f6 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -277,6 +277,7 @@ void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; +void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index b1753a6..93d3f07 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -146,6 +146,13 @@ HRESULT set_dochost_url(DocHost *This, const WCHAR *url) return S_OK; } +void notify_download_state(DocHost *dochost, BOOL is_downloading) +{ + DISPPARAMS dwl_dp = {NULL}; + TRACE("(%x)\n", is_downloading); + call_sink(dochost->cps.wbe2, is_downloading ? DISPID_DOWNLOADBEGIN : DISPID_DOWNLOADCOMPLETE, &dwl_dp); +} + static inline BindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) { return CONTAINING_RECORD(iface, BindStatusCallback, IBindStatusCallback_iface); @@ -896,6 +903,7 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo return S_OK; } + notify_download_state(This, TRUE); on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index aa90755..36994a4 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2718,7 +2718,7 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) CHECK_CALLED(Invoke_AMBIENT_USERMODE); todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); CHECK_CALLED(Invoke_BEFORENAVIGATE2); - todo_wine CHECK_CALLED(Invoke_DOWNLOADBEGIN); + CHECK_CALLED(Invoke_DOWNLOADBEGIN); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(Invoke_STATUSTEXTCHANGE);

1 0

Jacek Caban : ieframe: Use stored IOleCommandTarget in Exec implementation and get rid of no longer needed exec in IDocHostContainerVtbl.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: dfb79624cc60b40758325eecbc5214a123ae4bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb79624cc60b40758325eecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:30:50 2015 +0200 ieframe: Use stored IOleCommandTarget in Exec implementation and get rid of no longer needed exec in IDocHostContainerVtbl. --- dlls/ieframe/dochost.c | 16 +++++++++++++--- dlls/ieframe/ieframe.h | 1 - dlls/ieframe/iexplore.c | 9 +-------- dlls/ieframe/webbrowser.c | 20 +------------------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index a495292..55c1dfe 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -639,8 +639,15 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_UPDATECOMMANDS: + if(!This->olecmd) + return E_NOTIMPL; + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); case OLECMDID_SETDOWNLOADSTATE: - return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + if(This->olecmd) + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + + FIXME("Default action not implemented.\n"); + return E_NOTIMPL; default: FIXME("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; @@ -719,8 +726,11 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } - if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) - return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + if(!This->olecmd) + return E_NOTIMPL; + return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + } FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8a0b074..031cfae 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -106,7 +106,6 @@ typedef struct _IDocHostContainerVtbl void (WINAPI* GetDocObjRect)(DocHost*,RECT*); HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); void (WINAPI* SetURL)(DocHost*,LPCWSTR); - HRESULT (*exec)(DocHost*,const GUID*,DWORD,DWORD,VARIANT*,VARIANT*); } IDocHostContainerVtbl; struct DocHost { diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 08bb167..6260476 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -771,19 +771,12 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } -static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, - VARIANT *out) -{ - return E_NOTIMPL; -} - static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL, - DocHostContainer_exec + DocHostContainer_SetURL }; static HRESULT create_ie(InternetExplorer **ret_obj) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 8689c7e..5b4348b 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1208,30 +1208,12 @@ static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) { } -static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, - VARIANT *out) -{ - HRESULT hres; - - if(!doc_host->olecmd) - return E_NOTIMPL; - - hres = IOleCommandTarget_Exec(doc_host->olecmd, cmd_group, cmdid, execopt, in, out); - if(SUCCEEDED(hres)) - TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); - else - FIXME("Exec failed\n"); - - return hres; -} - static const IDocHostContainerVtbl DocHostContainerVtbl = { WebBrowser_addref, WebBrowser_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL, - DocHostContainer_exec + DocHostContainer_SetURL }; static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv)

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::form property implementation.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: a15751ab7371efc5c27e208916ff5402df5c17a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15751ab7371efc5c27e20891… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:47 2015 +0800 mshtml: Add IHTMLSelectElement::form property implementation. --- dlls/mshtml/htmlselect.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 899c8e5..3c869ff 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -371,8 +371,43 @@ static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTMLFormElement **p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; + HTMLDOMNode *node; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIDOMHTMLSelectElement_GetForm(This->nsselect, &nsform); + FIXME("get form %08x : %p\n", nsres, nsform); + if (NS_FAILED(nsres)) { + ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); + *p = NULL; + return E_FAIL; + } + if (nsform == NULL) { + TRACE("nsform not found\n"); + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); + nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); + if (FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + + node_release(node); + return hres; } static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElement *element, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fff65d8..3f68d87 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4313,6 +4313,40 @@ static void test_form_target(IUnknown *unk) IHTMLFormElement_Release(form); } +static void test_select_form(IUnknown *uselect, IUnknown *uform) +{ + IHTMLSelectElement *select = get_select_iface(uselect); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLSelectElement_get_form(select, NULL); + ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form != NULL, "form == NULL\n"); + + test_form_length((IUnknown*)form, 1); + test_form_elements((IUnknown*)form); + test_form_name((IUnknown*)form, "form_name"); + + ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); + + IHTMLSelectElement_Release(select); + IHTMLFormElement_Release(form); +} + +static void test_select_form_notfound(IHTMLSelectElement *select) +{ + IHTMLFormElement *form; + HRESULT hres; + + form = (IHTMLFormElement*)0xdeadbeef; + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form == NULL, "got %p\n", form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -4948,6 +4982,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_name(select, NULL); test_select_set_name(select, "select-name"); test_select_name(select, "select-name"); + test_select_form_notfound(select); test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); @@ -8491,6 +8526,16 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, + "<form id=\"form\" name=\"form_name\"><select id=\"sform\"></select></form>"); + elem = get_elem_by_id(doc, "sform", TRUE); + elem2 = get_elem_by_id(doc, "form", TRUE); + if(elem && elem2) { + test_select_form((IUnknown*)elem, (IUnknown*)elem2); + IHTMLElement_Release(elem); + IHTMLElement_Release(elem2); + } + test_attr(div); test_blocked(doc, div); test_elem_names(doc);

1 0

Jacek Caban : ieframe: Properly test events when container doesn' t support IOleCommandTarget add added more tests.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 4d1fa5d1b838a3507884bd700ac870919c9717cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1fa5d1b838a3507884bd700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 16:31:09 2015 +0200 ieframe: Properly test events when container doesn't support IOleCommandTarget add added more tests. --- dlls/ieframe/navigate.c | 2 + dlls/ieframe/tests/webbrowser.c | 150 ++++++++++++++++++++++++++-------------- 2 files changed, 99 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1fa5d1b838a3507884b…

1 0

Vincent Povirk : shell32: Use return value from IShellFolder_GetAttributesOf.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 642b2fe789942d1632f3aa9f1394435fd7e89e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642b2fe789942d1632f3aa9f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 11:41:55 2015 -0500 shell32: Use return value from IShellFolder_GetAttributesOf. --- dlls/shell32/shellitem.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index a410381..853325c 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -271,10 +271,13 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); - if(sfgaoMask == *psfgaoAttribs) - return S_OK; - else - return S_FALSE; + if (SUCCEEDED(ret)) + { + if(sfgaoMask == *psfgaoAttribs) + return S_OK; + else + return S_FALSE; + } } return ret;

1 0

Hans Leidekker : iphlpapi/tests: Fix a couple of test failures.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: f93bf5ae48f8576db620d3a55265f170289fa299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93bf5ae48f8576db620d3a55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:59:03 2015 +0200 iphlpapi/tests: Fix a couple of test failures. --- dlls/iphlpapi/tests/iphlpapi.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index fc91142..6553581 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1623,7 +1623,7 @@ static void test_CreateSortedAddressPairs(void) ret = pCreateSortedAddressPairs( NULL, 0, dst, 1, 0, &pair, &pair_count ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( pair != NULL, "pair not set\n" ); - ok( pair_count == 1, "got %u\n", pair_count ); + ok( pair_count >= 1, "got %u\n", pair_count ); ok( pair[0].SourceAddress != NULL, "src address not set\n" ); ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); pFreeMibTable( pair ); @@ -1638,7 +1638,7 @@ static void test_CreateSortedAddressPairs(void) ret = pCreateSortedAddressPairs( NULL, 0, dst, 2, 0, &pair, &pair_count ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( pair != NULL, "pair not set\n" ); - ok( pair_count == 2, "got %u\n", pair_count ); + ok( pair_count >= 2, "got %u\n", pair_count ); ok( pair[0].SourceAddress != NULL, "src address not set\n" ); ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); ok( pair[1].SourceAddress != NULL, "src address not set\n" ); @@ -1700,11 +1700,11 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - memset( &luid, 0, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceIndexToLuid( index, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceLuidToIndex */ @@ -1749,10 +1749,12 @@ static void test_interface_identifier_conversion(void) ret = pConvertInterfaceGuidToLuid( &guid, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceGuidToLuid( &guid, &luid ); ok( !ret, "got %u\n", ret ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceLuidToNameW */ ret = pConvertInterfaceLuidToNameW( NULL, NULL, 0 ); @@ -1796,42 +1798,42 @@ static void test_interface_identifier_conversion(void) ret = pConvertInterfaceNameToLuidW( NULL, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidW( NULL, &luid ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); ret = pConvertInterfaceNameToLuidW( nameW, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidW( nameW, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceNameToLuidA */ ret = pConvertInterfaceNameToLuidA( NULL, NULL ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidA( NULL, &luid ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); - ok( luid.Info.IfType, "got %u\n", luid.Info.IfType ); + ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); + ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); + ok( luid.Info.IfType == 0xdead, "type set\n" ); ret = pConvertInterfaceNameToLuidA( nameA, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidA( nameA, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); } @@ -1864,7 +1866,6 @@ static void test_GetIfEntry2(void) ret = pGetIfEntry2( &row ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( row.InterfaceIndex == index, "got %u\n", index ); - ok( row.InterfaceLuid.Info.NetLuidIndex, "got %u\n", index ); } START_TEST(iphlpapi)

1 0

Hans Leidekker : iphlpapi: Set the adapter LUID in GetAdaptersAddresses.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: bc334c679a852dc1f3fcb65dc0b659ee29389e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc334c679a852dc1f3fcb65dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:58:41 2015 +0200 iphlpapi: Set the adapter LUID in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4b1261a..e8daa8c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1003,6 +1003,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); + aa->Luid.Info.NetLuidIndex = index; + aa->Luid.Info.IfType = aa->IfType; if (num_v4_gateways) {

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::name property implementation.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: f7b9dd9525e1643097f60296874a70e4f77e1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b9dd9525e1643097f602968… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:21 2015 +0800 mshtml: Add IHTMLSelectElement::name property implementation. --- dlls/mshtml/htmlselect.c | 35 ++++++++++++++--------------------- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index e55d7ea..899c8e5 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -205,40 +205,33 @@ static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLSelectElement_SetName(This->nsselect, &str); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsAString name_str; - const PRUnichar *name = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&name_str, NULL); - nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); - if(NS_SUCCEEDED(nsres)) { - static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; - - nsAString_GetData(&name_str, &name); - - /* - * Native never returns empty string here. If an element has no name, - * name of previous element or ramdom data is returned. - */ - *p = SysAllocString(*name ? name : wszGarbage); - }else { - ERR("GetName failed: %08x\n", nsres); - } - nsAString_Finish(&name_str); - - TRACE("name=%s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7088c52..fff65d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2217,6 +2217,37 @@ static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LON ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); } +#define test_select_name(s,v) _test_select_name(__LINE__,s,v) +static void _test_select_name(unsigned line, IHTMLSelectElement *select, const char *extext) +{ + HRESULT hres; + BSTR text; + + text = NULL; + hres = IHTMLSelectElement_get_name(select, &text); + ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08x\n", hres); + if(extext) { + ok_(__FILE__,line) (text != NULL, "text == NULL\n"); + ok_(__FILE__,line) (!strcmp_wa(text, extext), "name = %s, expected %s\n", + wine_dbgstr_w(text), extext); + SysFreeString(text); + } else + ok_(__FILE__,line) (text == NULL, "text(%p) = %s\n", text, wine_dbgstr_w(text)); +} + +#define test_select_set_name(s,v) _test_select_set_name(__LINE__,s,v) +static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, const char *text) +{ + HRESULT hres; + BSTR bstr; + + bstr = a2bstr(text); + + hres = IHTMLSelectElement_put_name(select, bstr); + ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08x\n", wine_dbgstr_w(bstr), hres); + SysFreeString(bstr); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4914,6 +4945,10 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_size(select, 3, S_OK); test_select_size(select, 3); + test_select_name(select, NULL); + test_select_set_name(select, "select-name"); + test_select_name(select, "select-name"); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0