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

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequestFactory::create() method implementation.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: deb884a6d874b52cfd69e5cdc58c826cdc444603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb884a6d874b52cfd69e5cdc… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 30 21:50:30 2015 +0800 mshtml: Add IHTMLXMLHttpRequestFactory::create() method implementation. --- dlls/mshtml/htmlwindow.c | 14 ++++---- dlls/mshtml/mshtml_private.h | 5 ++- dlls/mshtml/nsembed.c | 50 ++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 85 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 13 ++++++- 5 files changed, 159 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deb884a6d874b52cfd69e…

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest:open() method implementation.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: d6b92300afd6bf9ce32ac314008cbee2e423836f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b92300afd6bf9ce32ac3140… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 30 21:51:21 2015 +0800 mshtml: Add IHTMLXMLHttpRequest:open() method implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/tests/xmlhttprequest.c | 27 +++++++----- dlls/mshtml/xmlhttprequest.c | 87 +++++++++++++++++++++++++++++++++++++- 4 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ca021ba..87e4154 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -855,6 +855,7 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DE void *nsalloc(size_t) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; void nsfree(void*) DECLSPEC_HIDDEN; +BOOL nsACString_Init(nsACString *str, const char *data) DECLSPEC_HIDDEN; void nsACString_InitDepend(nsACString*,const char*) DECLSPEC_HIDDEN; void nsACString_SetData(nsACString*,const char*) DECLSPEC_HIDDEN; UINT32 nsACString_GetData(const nsACString*,const char**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 962494a..df2e130 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -795,7 +795,7 @@ void nsfree(void *mem) NS_Free(mem); } -static BOOL nsACString_Init(nsACString *str, const char *data) +BOOL nsACString_Init(nsACString *str, const char *data) { return NS_SUCCEEDED(NS_CStringContainerInit2(str, data, PR_UINT32_MAX, 0)); } diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index abfba57..240f6d3 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -503,7 +503,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) SET_EXPECT(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - todo_wine ok(hres == S_OK, "open failed: %08x\n", hres); + ok(hres == S_OK, "open failed: %08x\n", hres); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); SysFreeString(method); @@ -517,30 +517,37 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + todo_wine ok(val == 0, "Expect 0, got %d\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(text == NULL, "Expect NULL, got %p\n", text); + todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + todo_wine ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 1, "Expect OPENED, got %d\n", val); + todo_wine ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + todo_wine ok(val == 1, "Expect OPENED, got %d\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); SET_EXPECT(xmlhttprequest_onreadystatechange_loading); SET_EXPECT(xmlhttprequest_onreadystatechange_done); hres = IHTMLXMLHttpRequest_send(xhr, vempty); - ok(hres == S_OK, "send failed: %08x\n", hres); - pump_msgs(&called_xmlhttprequest_onreadystatechange_done); + todo_wine ok(hres == S_OK, "send failed: %08x\n", hres); + if(SUCCEEDED(hres)) + pump_msgs(&called_xmlhttprequest_onreadystatechange_done); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); - CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + + if(FAILED(hres)) { + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; + return; + } val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index e79c2fc..3953237 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -33,6 +33,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT bstr_to_nsacstr(BSTR bstr, nsACString *str) +{ + char *cstr = heap_strdupWtoU(bstr); + if(!cstr) + return E_OUTOFMEMORY; + nsACString_Init(str, cstr); + heap_free(cstr); + return S_OK; +} + +static HRESULT variant_to_nsastr(VARIANT var, nsAString *ret) +{ + switch(V_VT(&var)) { + case VT_NULL: + case VT_ERROR: + case VT_EMPTY: + nsAString_Init(ret, NULL); + return S_OK; + case VT_BSTR: + nsAString_InitDepend(ret, V_BSTR(&var)); + return S_OK; + default: + FIXME("Unsupported VARIANT: %s\n", debugstr_variant(&var)); + return E_INVALIDARG; + } +} + /* IHTMLXMLHttpRequest */ typedef struct { EventTarget event_target; @@ -198,8 +225,64 @@ static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface) static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR bstrMethod, BSTR bstrUrl, VARIANT varAsync, VARIANT varUser, VARIANT varPassword) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(bstrMethod), debugstr_w(bstrUrl), debugstr_variant(&varAsync), debugstr_variant(&varUser), debugstr_variant(&varPassword)); - return E_NOTIMPL; + nsACString method, url; + nsAString user, password; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(bstrMethod), debugstr_w(bstrUrl), debugstr_variant(&varAsync), debugstr_variant(&varUser), debugstr_variant(&varPassword)); + + if(V_VT(&varAsync) != VT_BOOL) { + FIXME("varAsync not supported: %s\n", debugstr_variant(&varAsync)); + return E_FAIL; + } + + /* Note: Starting with Gecko 30.0 (Firefox 30.0 / Thunderbird 30.0 / SeaMonkey 2.27), + * synchronous requests on the main thread have been deprecated due to the negative + * effects to the user experience. + */ + if(!V_BOOL(&varAsync)) { + FIXME("Synchronous request is not supported yet\n"); + return E_FAIL; + } + + hres = variant_to_nsastr(varUser, &user); + if(FAILED(hres)) + return hres; + hres = variant_to_nsastr(varPassword, &password); + if(FAILED(hres)) { + nsAString_Finish(&user); + return hres; + } + + hres = bstr_to_nsacstr(bstrMethod, &method); + if(FAILED(hres)) { + nsAString_Finish(&user); + nsAString_Finish(&password); + return hres; + } + hres = bstr_to_nsacstr(bstrUrl, &url); + if(FAILED(hres)) { + nsAString_Finish(&user); + nsAString_Finish(&password); + nsACString_Finish(&method); + return hres; + } + + nsres = nsIXMLHttpRequest_Open(This->nsxhr, &method, &url, TRUE, + &user, &password, 0); + + nsACString_Finish(&method); + nsACString_Finish(&url); + nsAString_Finish(&user); + nsAString_Finish(&password); + + if(NS_FAILED(nsres)) { + ERR("nsIXMLHttpRequest_Open failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody)

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest:: readyState property implementation.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: b6cf265317595221081d787bd76a5cc08e43429b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cf265317595221081d787bd… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 30 21:53:20 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::readyState property implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 16 ++++++++-------- dlls/mshtml/xmlhttprequest.c | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 240f6d3..cf5f674 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -362,12 +362,12 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(V_DISPATCH(&var) == (IDispatch*)&xmlhttprequest_onreadystatechange_obj, "unexpected onreadystatechange value\n"); hres = IHTMLXMLHttpRequest_get_readyState(xhr, NULL); - todo_wine ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - todo_wine ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - todo_wine ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(val == 0, "Expect UNSENT, got %d\n", val); hres = IHTMLXMLHttpRequest_get_status(xhr, NULL); todo_wine ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); @@ -492,8 +492,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - todo_wine ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - todo_wine ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(val == 0, "Expect UNSENT, got %d\n", val); method = a2bstr("GET"); url = a2bstr(xml_url); @@ -526,8 +526,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - todo_wine ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - todo_wine ok(val == 1, "Expect OPENED, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(val == 1, "Expect OPENED, got %d\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -564,7 +564,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 4, "Expect DONE, got %d\n", val); + todo_wine ok(val == 4, "Expect DONE, got %d\n", val); hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); ok(hres == S_OK, "get_responseText failed: %08x\n", hres); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 3953237..6f417a5 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -158,8 +158,20 @@ static HRESULT WINAPI HTMLXMLHttpRequest_Invoke(IHTMLXMLHttpRequest *iface, DISP static HRESULT WINAPI HTMLXMLHttpRequest_get_readyState(IHTMLXMLHttpRequest *iface, LONG *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT16 val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + nsres = nsIXMLHttpRequest_GetReadyState(This->nsxhr, &val); + if(NS_FAILED(nsres)) { + ERR("nsIXMLHttpRequest_GetReadyState failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_get_responseBody(IHTMLXMLHttpRequest *iface, VARIANT *p)

1 0

Sebastian Lackner : ntdll: Implement TpSimpleTryPost and basic threadpool infrastructure.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: db9fc9141e8947a540584fcf4ebde2a84051803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9fc9141e8947a540584fcf4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:55:27 2015 +0200 ntdll: Implement TpSimpleTryPost and basic threadpool infrastructure. --- dlls/ntdll/ntdll.spec | 3 + dlls/ntdll/tests/threadpool.c | 3 +- dlls/ntdll/threadpool.c | 454 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 459 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db9fc9141e8947a540584…

1 0

Sebastian Lackner : ntdll: Implement TpSetPoolMaxThreads.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: d56984a03d3a5e8a256ff5a46540478cba01c191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56984a03d3a5e8a256ff5a46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:55:53 2015 +0200 ntdll: Implement TpSetPoolMaxThreads. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/threadpool.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cd4e853..f023443 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -972,6 +972,7 @@ @ stdcall RtlxUnicodeStringToOemSize(ptr) RtlUnicodeStringToOemSize @ stdcall TpAllocPool(ptr ptr) @ stdcall TpReleasePool(ptr) +@ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSimpleTryPost(ptr ptr ptr) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmIsOptedIn() diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index d8dc929..19f288a 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1466,6 +1466,21 @@ VOID WINAPI TpReleasePool( TP_POOL *pool ) } /*********************************************************************** + * TpSetPoolMaxThreads (NTDLL.@) + */ +VOID WINAPI TpSetPoolMaxThreads( TP_POOL *pool, DWORD maximum ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %u\n", pool, maximum ); + + RtlEnterCriticalSection( &this->cs ); + this->max_workers = max( maximum, 1 ); + this->min_workers = min( this->min_workers, this->max_workers ); + RtlLeaveCriticalSection( &this->cs ); +} + +/*********************************************************************** * TpSimpleTryPost (NTDLL.@) */ NTSTATUS WINAPI TpSimpleTryPost( PTP_SIMPLE_CALLBACK callback, PVOID userdata,

1 0

Sebastian Lackner : ntdll: Implement TpSetPoolMinThreads.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 7d9ec31e19029b726767dafaad25922eb1ad2564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9ec31e19029b726767dafaa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:56:26 2015 +0200 ntdll: Implement TpSetPoolMinThreads. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/threadpool.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f023443..94194d6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -973,6 +973,7 @@ @ stdcall TpAllocPool(ptr ptr) @ stdcall TpReleasePool(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) +@ stdcall TpSetPoolMinThreads(ptr long) @ stdcall TpSimpleTryPost(ptr ptr ptr) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmIsOptedIn() diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 19f288a..6025633 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1481,6 +1481,41 @@ VOID WINAPI TpSetPoolMaxThreads( TP_POOL *pool, DWORD maximum ) } /*********************************************************************** + * TpSetPoolMinThreads (NTDLL.@) + */ +BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + NTSTATUS status = STATUS_SUCCESS; + + TRACE( "%p %u\n", pool, minimum ); + + RtlEnterCriticalSection( &this->cs ); + + while (this->num_workers < minimum) + { + HANDLE thread; + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + threadpool_worker_proc, this, &thread, NULL ); + if (status != STATUS_SUCCESS) + break; + + interlocked_inc( &this->refcount ); + this->num_workers++; + NtClose( thread ); + } + + if (status == STATUS_SUCCESS) + { + this->min_workers = minimum; + this->max_workers = max( this->min_workers, this->max_workers ); + } + + RtlLeaveCriticalSection( &this->cs ); + return !status; +} + +/*********************************************************************** * TpSimpleTryPost (NTDLL.@) */ NTSTATUS WINAPI TpSimpleTryPost( PTP_SIMPLE_CALLBACK callback, PVOID userdata,

1 0

Sebastian Lackner : ntdll: Implement threadpool cleanup group functions.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 68d92bceeda212252135a95dbafa4aa7aaf1c108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d92bceeda212252135a95db… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:57:15 2015 +0200 ntdll: Implement threadpool cleanup group functions. --- dlls/ntdll/ntdll.spec | 3 + dlls/ntdll/threadpool.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 266 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d92bceeda212252135a…

1 0