wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Michael Stefaniuc : mscms: Remove always false if subexpression ( PVS-Studio).
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: be90236fab6f3489dc1ebc35d5dae4c0113cad36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90236fab6f3489dc1ebc35d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 11:28:58 2014 +0100 mscms: Remove always false if subexpression (PVS-Studio). --- dlls/mscms/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index d6ee715..eb9b4d0 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -649,7 +649,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); - if (*size < len || !profile) + if (*size < len) { *size = len; SetLastError( ERROR_MORE_DATA );

1 0

Michael Stefaniuc : mapi32/tests: Test the correct return code (PVS-Studio ).
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: dc467bf2331ea556e1bc1bcfa3356140d242f429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc467bf2331ea556e1bc1bcfa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 11:25:07 2014 +0100 mapi32/tests: Test the correct return code (PVS-Studio). --- dlls/mapi32/tests/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index a26f003..4e09931 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -1232,7 +1232,7 @@ static void test_IProp(void) /* GetLastError - No errors set */ lpError = NULL; - IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError); + sc = IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError); ok(sc == S_OK && !lpError, "GetLastError: Expected S_OK, null, got 0x%08X,%p\n", sc, lpError);

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_isTextEdit implementation.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: c1afef340ccde247a6106764e541b7fba755feb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1afef340ccde247a6106764e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 19:29:46 2014 +0100 mshtml: Added IHTMLElement::get_isTextEdit implementation. --- dlls/mshtml/htmlbody.c | 8 +++++++- dlls/mshtml/htmlelem.c | 8 ++++++-- dlls/mshtml/htmlinput.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/mshtml/htmltextarea.c | 8 +++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 748302e..0c8691a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -833,6 +833,11 @@ static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) : &This->textcont.element.node.event_target; } +static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static const cpc_entry_t HTMLBodyElement_cpc[] = { {&DIID_HTMLTextContainerEvents}, {&IID_IPropertyNotifySink}, @@ -857,7 +862,8 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { NULL, NULL, HTMLBodyElement_traverse, - HTMLBodyElement_unlink + HTMLBodyElement_unlink, + HTMLBodyElement_is_text_edit }; static const tid_t HTMLBodyElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d6cb18f..da7c0f7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1665,8 +1665,12 @@ static HRESULT WINAPI HTMLElement_get_parentTextEdit(IHTMLElement *iface, IHTMLE static HRESULT WINAPI HTMLElement_get_isTextEdit(IHTMLElement *iface, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node) + ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4ce01b5..42e5796 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1260,6 +1260,32 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO return IHTMLInputElement_get_disabled(&This->IHTMLInputElement_iface, p); } +static BOOL HTMLInputElement_is_text_edit(HTMLDOMNode *iface) +{ + HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + const PRUnichar *type; + nsAString nsstr; + nsresult nsres; + BOOL ret = FALSE; + + static const WCHAR buttonW[] = {'b','u','t','t','o','n',0}; + static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; + static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; + static const WCHAR resetW[] = {'r','e','s','e','t',0}; + static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; + static const WCHAR textW[] = {'t','e','x','t',0}; + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLInputElement_GetType(This->nsinput, &nsstr); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&nsstr, &type); + ret = !strcmpW(type, buttonW) || !strcmpW(type, hiddenW) || !strcmpW(type, passwordW) + || !strcmpW(type, resetW) || !strcmpW(type, submitW) || !strcmpW(type, textW); + } + nsAString_Finish(&nsstr); + return ret; +} + static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1297,7 +1323,8 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { NULL, NULL, HTMLInputElement_traverse, - HTMLInputElement_unlink + HTMLInputElement_unlink, + HTMLInputElement_is_text_edit }; static const tid_t HTMLInputElement_iface_tids[] = { @@ -1764,6 +1791,11 @@ static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); } +static BOOL HTMLButtonElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLButtonElement *This = button_from_HTMLDOMNode(iface); @@ -1801,7 +1833,8 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { NULL, NULL, HTMLButtonElement_traverse, - HTMLButtonElement_unlink + HTMLButtonElement_unlink, + HTMLButtonElement_is_text_edit }; static const tid_t HTMLButtonElement_iface_tids[] = { diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index f756e08..43086f9 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -437,6 +437,11 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ return IHTMLTextAreaElement_get_disabled(&This->IHTMLTextAreaElement_iface, p); } +static BOOL HTMLTextAreaElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static void HTMLTextAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -474,7 +479,8 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { NULL, NULL, HTMLTextAreaElement_traverse, - HTMLTextAreaElement_unlink + HTMLTextAreaElement_unlink, + HTMLTextAreaElement_is_text_edit }; static const tid_t HTMLTextAreaElement_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 497a9e1..8529231 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -646,6 +646,7 @@ typedef struct { HRESULT (*bind_to_tree)(HTMLDOMNode*); void (*traverse)(HTMLDOMNode*,nsCycleCollectionTraversalCallback*); void (*unlink)(HTMLDOMNode*); + BOOL (*is_text_edit)(HTMLDOMNode*); } NodeImplVtbl; struct HTMLDOMNode { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a47207..d164f1b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2538,6 +2538,18 @@ static void _test_elem_contains(unsigned line, IHTMLElement *elem, IHTMLElement ok_(__FILE__,line)(b == exval, "contains returned %x, expected %x\n", b, exval); } +#define test_elem_istextedit(a,b) _test_elem_istextedit(__LINE__,a,b) +static void _test_elem_istextedit(unsigned line, IHTMLElement *elem, VARIANT_BOOL exval) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 100; + hres = IHTMLElement_get_isTextEdit(elem, &b); + ok_(__FILE__,line)(hres == S_OK, "isTextEdit failed: %08x\n", hres); + ok_(__FILE__,line)(b == exval, "isTextEdit = %x\n", b); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -6122,6 +6134,8 @@ static void test_defaults(IHTMLDocument2 *doc) test_body_funs(body); IHTMLBodyElement_Release(body); + test_elem_istextedit(elem, VARIANT_TRUE); + hres = IHTMLElement_get_style(elem, &style); ok(hres == S_OK, "get_style failed: %08x\n", hres); @@ -6264,6 +6278,8 @@ static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); set_button_name(elem, "button name"); + + test_elem_istextedit(elem, VARIANT_TRUE); } #define test_tr_possess(e,r,l,i) _test_tr_possess(__LINE__,e,r,l,i) @@ -7351,6 +7367,7 @@ static void test_elems(IHTMLDocument2 *doc) test_plugins_col(doc); elem = get_doc_elem(doc); + test_elem_istextedit(elem, VARIANT_FALSE); test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElement_Release(elem); @@ -7370,6 +7387,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_tabindex((IUnknown*)elem, 0); test_elem_set_tabindex((IUnknown*)elem, 1); test_elem_filters((IUnknown*)elem); + test_elem_istextedit(elem, VARIANT_FALSE); node = test_node_get_parent((IUnknown*)elem); ok(node != NULL, "node == NULL\n"); @@ -7430,6 +7448,7 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); + test_elem_istextedit(elem, VARIANT_FALSE); test_elem_title((IUnknown*)select, NULL); test_elem_set_title((IUnknown*)select, "Title"); test_elem_title((IUnknown*)select, "Title"); @@ -7467,6 +7486,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); test_elem_language(elem, NULL); + test_elem_istextedit(elem, VARIANT_FALSE); if(hres == S_OK) { @@ -7530,6 +7550,7 @@ static void test_elems(IHTMLDocument2 *doc) test_input_get_disabled(input, VARIANT_FALSE); test_elem_client_size((IUnknown*)elem); test_input_type(input, "text"); + test_elem_istextedit(elem, VARIANT_TRUE); test_node_get_value_str((IUnknown*)elem, NULL); test_node_put_value_str((IUnknown*)elem, "test"); @@ -8122,6 +8143,8 @@ static void test_elems2(IHTMLDocument2 *doc) form = get_textarea_form((IUnknown*)elem); ok(!form, "form = %p\n", form); + test_elem_istextedit(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Include nsbody reference in cycle collection.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 278daad3bdd202283ea29c0089c19613efbe8f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=278daad3bdd202283ea29c008… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 19:29:35 2014 +0100 mshtml: Include nsbody reference in cycle collection. --- dlls/mshtml/htmlbody.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 7117087..748302e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -805,13 +805,23 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->textcont.element.node, riid, ppv); } -static void HTMLBodyElement_destructor(HTMLDOMNode *iface) +static void HTMLBodyElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - nsIDOMHTMLBodyElement_Release(This->nsbody); + if(This->nsbody) + note_cc_edge((nsISupports*)This->nsbody, "This->nsbody", cb); +} + +static void HTMLBodyElement_unlink(HTMLDOMNode *iface) +{ + HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - HTMLElement_destructor(&This->textcont.element.node); + if(This->nsbody) { + nsIDOMHTMLBodyElement *nsbody = This->nsbody; + This->nsbody = NULL; + nsIDOMHTMLBodyElement_Release(nsbody); + } } static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) @@ -832,12 +842,22 @@ static const cpc_entry_t HTMLBodyElement_cpc[] = { static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLBodyElement_QI, - HTMLBodyElement_destructor, + HTMLElement_destructor, HTMLBodyElement_cpc, HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target + HTMLBodyElement_get_event_target, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLBodyElement_traverse, + HTMLBodyElement_unlink }; static const tid_t HTMLBodyElement_iface_tids[] = {

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode::splitText implementation.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: b69550ab348941d16747f0af2492901622778908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69550ab348941d16747f0af2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 16:32:48 2014 +0100 mshtml: Added IHTMLDOMTextNode::splitText implementation. --- dlls/mshtml/htmltextnode.c | 27 +++++++++++++++++++++++++-- dlls/mshtml/tests/jstest.html | 16 ++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index fd4795b..411123d 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -152,8 +152,31 @@ static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG * static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - FIXME("(%p)->(%d %p)\n", This, offset, pRetNode); - return E_NOTIMPL; + HTMLDOMNode *node; + nsIDOMText *text; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, offset, pRetNode); + + nsres = nsIDOMText_SplitText(This->nstext, offset, &text); + if(NS_FAILED(nsres)) { + ERR("SplitText failed: %x08x\n", nsres); + return E_FAIL; + } + + if(!text) { + *pRetNode = NULL; + return S_OK; + } + + hres = get_node(This->node.doc, (nsIDOMNode*)text, TRUE, &node); + nsIDOMText_Release(text); + if(FAILED(hres)) + return hres; + + *pRetNode = &node->IHTMLDOMNode_iface; + return S_OK; } static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2b3634e..528c2e1 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -339,6 +339,21 @@ function test_language_attribute() { ok(elem.language === "1", "elem.language = " + elem.language); } +function test_text_node() { + document.body.innerHTML = 'testing text'; + var text = document.body.childNodes[0], text2; + ok(text.data == "testing text", "text.data = " + text.data); + + text2 = text.splitText(7); + ok(text.data == "testing", "text.data = " + text.data); + ok(text2.data == " text", "text2.data = " + text2.data); + ok(text.nextSibling === text2, "text.nextSibling !== text2"); + + text2 = text.splitText(0); + ok(text.data == "", "text.data = " + text.data); + ok(text2.data == "testing", "text2.data = " + text2.data); +} + var globalVar = false; function runTests() { @@ -363,6 +378,7 @@ function runTests() { test_customtag(); test_whitespace_nodes(); test_language_attribute(); + test_text_node(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Amine Khaldi : shdocvw: Fix inverted StopWatch forwards.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 998d34648734430979f8e3396ee797f59617e26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=998d34648734430979f8e3396… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Dec 20 16:56:51 2014 +0100 shdocvw: Fix inverted StopWatch forwards. --- dlls/shdocvw/shdocvw_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 3ce5df1..2e5f2c9 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -317,12 +317,12 @@ void WINAPI StopWatchFlushFORWARD(void) } /****************************************************************** - * StopWatchWFORWARD (SHDOCVW.@) + * StopWatchAFORWARD (SHDOCVW.@) */ -DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, +DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(243))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); @@ -330,12 +330,12 @@ DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, } /****************************************************************** - * StopWatchAFORWARD (SHDOCVW.@) + * StopWatchWFORWARD (SHDOCVW.@) */ -DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, +DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(244))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp);

1 0

Jacek Caban : d3d11.idl: Added D3D11_APPEND_ALIGNED_ELEMENT declaration.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: f28c441673aed46bdc24f72b315f2002728691bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28c441673aed46bdc24f72b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 20 14:06:51 2014 +0100 d3d11.idl: Added D3D11_APPEND_ALIGNED_ELEMENT declaration. --- include/d3d11.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index eef826f..e472944 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -445,6 +445,8 @@ typedef enum D3D11_INPUT_CLASSIFICATION D3D11_INPUT_PER_INSTANCE_DATA, } D3D11_INPUT_CLASSIFICATION; +const UINT D3D11_APPEND_ALIGNED_ELEMENT = 0xffffffff; + typedef struct D3D11_INPUT_ELEMENT_DESC { LPCSTR SemanticName;

1 0

Sergey Kalinichev : ntdll: Add stub for RtlSetHeapInformation.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 7eed378f5dc907e9733124727bcd03aacebbd3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eed378f5dc907e9733124727… Author: Sergey Kalinichev <kalinichev.so.0(a)gmail.com> Date: Mon Dec 15 21:15:07 2014 +0400 ntdll: Add stub for RtlSetHeapInformation. --- dlls/kernel32/heap.c | 5 +++-- dlls/ntdll/heap.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9037f8e..cac73ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -296,8 +296,9 @@ BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { - FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); - return TRUE; + NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; } /* diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3bb7a11..4ef44cf 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2252,3 +2252,12 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS inf return STATUS_INVALID_INFO_CLASS; } } + +/*********************************************************************** + * RtlSetHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, PVOID info, SIZE_T size) +{ + FIXME("%p %d %p %ld stub\n", heap, info_class, info, size); + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7e95969..51de6e7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -847,7 +847,7 @@ @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) -# @ stub RtlSetHeapInformation +@ stdcall RtlSetHeapInformation(long long ptr long) @ stub RtlSetInformationAcl @ stdcall RtlSetIoCompletionCallback(long ptr long) @ stdcall RtlSetLastWin32Error(long) diff --git a/include/winternl.h b/include/winternl.h index 5a27f94..1a694da 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2507,6 +2507,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING*); NTSYSAPI void WINAPI RtlSetCurrentEnvironment(PWSTR, PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR*,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlSetHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMPLETION_ROUTINE,ULONG);

1 0

Hans Leidekker : rpcrt4: Make sure the Content-Length header is set correctly when preparing the out pipe.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 49a2fb660be589f5bdbd3c2e71fb7f48d8f37836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a2fb660be589f5bdbd3c2e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 17:06:19 2014 +0100 rpcrt4: Make sure the Content-Length header is set correctly when preparing the out pipe. --- dlls/rpcrt4/rpc_transport.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c5ed04d..3016d83 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2321,14 +2321,17 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy const UUID *out_pipe_uuid, ULONG *flow_control_increment, BOOL authorized) { + static const WCHAR fmtW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - DWORD bytes_read; + DWORD bytes_read, len; BYTE buf[20]; + WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; if (!authorized) { @@ -2344,7 +2347,8 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy TRACE("sending HTTP connect header to server\n"); prepare_async_request(async_data); - ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); + len = sprintfW(header, fmtW, hdr->common.frag_len); + ret = HttpSendRequestW(out_request, header, len, hdr, hdr->common.frag_len); status = wait_async_request(async_data, ret, cancel_event); RPCRT4_FreeHeader(hdr); if (status != RPC_S_OK) return status;

1 0

Hans Leidekker : wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 3d9ba21d2f2dd9666eaca11cef706401789ac537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9ba21d2f2dd9666eaca11ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 16:50:17 2014 +0100 wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused. --- dlls/wininet/tests/http.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 98c8d62..92a6b8d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2290,6 +2290,28 @@ static DWORD CALLBACK server_thread(LPVOID param) else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); else send(c, notokmsg, sizeof(notokmsg)-1, 0); } + if (strstr(buffer, "/test_request_content_length")) + { + static char msg[] = "HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\n\r\n"; + static int seen_content_length; + + if (!seen_content_length) + { + if (strstr(buffer, "Content-Length: 0")) + { + seen_content_length = 1; + send(c, msg, sizeof msg-1, 0); + } + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + else + { + if (strstr(buffer, "Content-Length: 0")) send(c, msg, sizeof msg-1, 0); + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -4111,6 +4133,42 @@ static void test_cache_control_verb(int port) InternetCloseHandle(session); } +static void test_request_content_length(int port) +{ + char data[] = {'t','e','s','t'}; + HINTERNET ses, con, req; + BOOL ret; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "POST", "/test_request_content_length", NULL, NULL, NULL, + INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + ret = HttpSendRequestA(req, NULL, 0, data, sizeof(data)); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + CloseHandle(hCompleteEvent); +} + static void test_http_connection(void) { struct server_info si; @@ -4156,6 +4214,7 @@ static void test_http_connection(void) test_cache_control_verb(si.port); test_successive_HttpSendRequest(si.port); test_head_request(si.port); + test_request_content_length(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014