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

Daniel Lehman : msvcp90: Make argument to _Locinfo__Getdays/months const.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 1ee74905bb7817747f545c56f907c048d7046302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee74905bb7817747f545c56f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 26 09:59:20 2015 -0700 msvcp90: Make argument to _Locinfo__Getdays/months const. --- dlls/msvcp90/locale.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b3275c1..f9a42e6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -800,7 +800,7 @@ int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) /* ?_Getdays(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getdays(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdays, 4) -const char* __thiscall _Locinfo__Getdays(_Locinfo *this) +const char* __thiscall _Locinfo__Getdays(const _Locinfo *this) { char *days = _Getdays(); const char *ret; @@ -808,8 +808,8 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) TRACE("(%p)\n", this); if(days) { - locale_string_char_dtor(&this->days); - locale_string_char_ctor_cstr(&this->days, days); + locale_string_char_dtor((locale_string *)&this->days); + locale_string_char_ctor_cstr((locale_string *)&this->days, days); free(days); } @@ -822,7 +822,7 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) /* ?_W_Getdays(a)_Locinfo@std@@QBEPBGXZ */ /* ?_W_Getdays(a)_Locinfo@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__W_Getdays, 4) -const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) +const wchar_t* __thiscall _Locinfo__W_Getdays(const _Locinfo *this) { static const wchar_t defdays[] = { @@ -840,8 +840,8 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) TRACE("(%p)\n", this); if(wdays) { - locale_string_wchar_dtor(&this->wdays); - locale_string_wchar_ctor_cstr(&this->wdays, wdays); + locale_string_wchar_dtor((locale_string_wchar *)&this->wdays); + locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wdays, wdays); free(wdays); } @@ -853,7 +853,7 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) /* ?_W_Getmonths(a)_Locinfo@std@@QBEPBGXZ */ /* ?_W_Getmonths(a)_Locinfo@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__W_Getmonths, 4) -const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) +const wchar_t* __thiscall _Locinfo__W_Getmonths(const _Locinfo *this) { static const wchar_t defmonths[] = { @@ -876,8 +876,8 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) TRACE("(%p)\n", this); if(wmonths) { - locale_string_wchar_dtor(&this->wmonths); - locale_string_wchar_ctor_cstr(&this->wmonths, wmonths); + locale_string_wchar_dtor((locale_string_wchar *)&this->wmonths); + locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wmonths, wmonths); free(wmonths); } @@ -890,7 +890,7 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) /* ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getmonths, 4) -const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) +const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) { char *months = _Getmonths(); const char *ret; @@ -898,8 +898,8 @@ const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) TRACE("(%p)\n", this); if(months) { - locale_string_char_dtor(&this->months); - locale_string_char_ctor_cstr(&this->months, months); + locale_string_char_dtor((locale_string *)&this->months); + locale_string_char_ctor_cstr((locale_string *)&this->months, months); free(months); }

1 0

Bernhard Übelacker : mpr: Call RegEnumValueA with valid value parameter.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: b4ded3d77454cbcb2e1e06acde4c53b14cbd9ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ded3d77454cbcb2e1e06acd… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:02 2015 +0200 mpr: Call RegEnumValueA with valid value parameter. --- dlls/mpr/pwcache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index 178d40f..aa09522 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -306,7 +306,8 @@ UINT WINAPI WNetEnumCachedPasswords( entry->cbPassword = data_sz; entry->iEntry = i; entry->nType = nType; - r = RegEnumValueA( hkey, i, NULL, &val_sz, NULL, &type, + size = sizeof val; + r = RegEnumValueA( hkey, i, val, &size, NULL, &type, &entry->abResource[val_sz], &data_sz ); if( r == ERROR_SUCCESS ) enumPasswordProc( entry, param );

1 0

Bernhard Übelacker : mpr/tests: Add tests for WNetCachePassword and friends.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: d1ca4e87c31e1cc2fa4e4c734eb3337fb035a48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ca4e87c31e1cc2fa4e4c734… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:01 2015 +0200 mpr/tests: Add tests for WNetCachePassword and friends. --- dlls/mpr/tests/mpr.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 6a15ebf..f3349df 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -160,8 +160,106 @@ static void test_WNetGetRemoteName(void) } } +static DWORD (WINAPI *pWNetCachePassword)( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +static DWORD (WINAPI *pWNetGetCachedPassword)( LPSTR, WORD, LPSTR, LPWORD, BYTE ); +static UINT (WINAPI *pWNetEnumCachedPasswords)( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); +static UINT (WINAPI *pWNetRemoveCachedPassword)( LPSTR, WORD, BYTE ); + +#define MPR_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hmpr, #func) + +static void InitFunctionPtrs(void) +{ + HMODULE hmpr = GetModuleHandleA("mpr.dll"); + + MPR_GET_PROC(WNetCachePassword); + MPR_GET_PROC(WNetGetCachedPassword); + MPR_GET_PROC(WNetEnumCachedPasswords); + MPR_GET_PROC(WNetRemoveCachedPassword); +} + +static const char* m_resource = "wine-test-resource"; +static const char* m_password = "wine-test-password"; +static const BYTE m_type = 1; +static const DWORD m_param = 8; +static BOOL m_callback_reached; + +static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param) +{ + WORD size = 0; + char* buf; + + ok(param == m_param, "param, got %d, got %d\n", param, m_param); + + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[pce->cbResource + pce->cbPassword] ); + ok(pce->cbEntry == size, "cbEntry, got %d, expected %d\n", pce->cbEntry, size); + ok(pce->cbResource == strlen(m_resource), "cbResource, got %d\n", pce->cbResource); + ok(pce->cbPassword == strlen(m_password), "cbPassword, got %d\n", pce->cbPassword); + ok(pce->iEntry == 0, "iEntry, got %d, got %d\n", pce->iEntry, 0); + ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); + + buf = (char*)pce->abResource; + ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); + + buf += pce->cbResource; + ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); + + m_callback_reached = 1; + return TRUE; +} + +static void test_WNetCachePassword(void) +{ + char resource_buf[32]; + char password_buf[32]; + char prefix_buf[32]; + WORD resource_len; + WORD password_len; + WORD prefix_len; + DWORD ret; + + InitFunctionPtrs(); + + if (pWNetCachePassword && + pWNetGetCachedPassword && + pWNetEnumCachedPasswords && + pWNetRemoveCachedPassword) + { + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, m_password); + password_len = strlen(m_password); + ret = pWNetCachePassword(resource_buf, resource_len, password_buf, password_len, m_type, 0); + ok(ret == WN_SUCCESS, "WNetCachePassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, "------"); + password_len = sizeof(password_buf); + ret = pWNetGetCachedPassword(resource_buf, resource_len, password_buf, &password_len, m_type); + ok(ret == WN_SUCCESS, "WNetGetCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(password_len == strlen(m_password), "password length different, got %d\n", password_len); + ok(strncmp(password_buf, m_password, password_len)==0, "passwords different, got %.*s, expected %s\n", password_len, password_buf, m_password); + + prefix_len = 9; + strcpy(prefix_buf, m_resource); + prefix_buf[prefix_len] = '0'; + ret = pWNetEnumCachedPasswords(prefix_buf, prefix_len, m_type, enum_password_proc, m_param); + ok(ret == WN_SUCCESS, "WNetEnumCachedPasswords failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(m_callback_reached == 1, "callback was not reached\n"); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + ret = pWNetRemoveCachedPassword(resource_buf, resource_len, m_type); + ok(ret == WN_SUCCESS, "WNetRemoveCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + } else { + win_skip("WNetCachePassword() is not supported.\n"); + } +} + START_TEST(mpr) { test_WNetGetUniversalName(); test_WNetGetRemoteName(); + test_WNetCachePassword(); }

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequestFactory::create() method implementation.
by Alexandre Julliard July 1, 2015

July 1, 2015

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:: readyState property implementation.
by Alexandre Julliard July 1, 2015

July 1, 2015

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 : windowscodecs: Fix build failure on OSX.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: e5f57e63424bbe0ab1c95ffbb598e1fef157238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f57e63424bbe0ab1c95ffbb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 30 21:02:19 2015 +0200 windowscodecs: Fix build failure on OSX. --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 54c7707..5d48a1a 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) if (This->icns_image != NULL) HeapFree(GetProcessHeap(), 0, This->icns_image); - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest:open() method implementation.
by Alexandre Julliard July 1, 2015

July 1, 2015

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