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

Zhenbo Li : mshtml: Remove unnecessary FIXME.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 89d0c66461f9ddbe9e3eeaebd1c8a1c39b0e6888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d0c66461f9ddbe9e3eeaebd… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 22 21:18:03 2015 +0800 mshtml: Remove unnecessary FIXME. --- dlls/mshtml/htmlselect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3c869ff..6dc4dfb 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -383,7 +383,6 @@ static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTM 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;

1 0

Aaryaman Vasishta : d3drm: Fix spelling mistake in Set/ GetDecalTransparentColor macros.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 364069fe77cec8a9719ef4f89d222c6f9093f7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=364069fe77cec8a9719ef4f89… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:36 2015 +0530 d3drm: Fix spelling mistake in Set/GetDecalTransparentColor macros. --- include/d3drmobj.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 942c69a..28340fb 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3284,7 +3284,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture_GetImage(p) (p)->GetImage() @@ -3292,7 +3292,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_GetColors(p) (p)->GetColors() #define IDirect3DRMTexture_GetDecalScale(p) (p)->GetDecalScale() #define IDirect3DRMTexture_GetDecalTransparency(p) (p)->GetDecalTransparency() -#define IDirect3DRMTexture_GetDecalTransparencyColor(p) (p)->GetDecalTransparencyColor() +#define IDirect3DRMTexture_GetDecalTransparentColor(p) (p)->GetDecalTransparentColor() #endif /***************************************************************************** @@ -3404,7 +3404,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture2_GetImage(p) (p)->GetImage() @@ -3412,7 +3412,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_GetColors(p) (p)->GetColors() #define IDirect3DRMTexture2_GetDecalScale(p) (p)->GetDecalScale() #define IDirect3DRMTexture2_GetDecalTransparency(p) (p)->GetDecalTransparency() -#define IDirect3DRMTexture2_GetDecalTransparencyColor(p) (p)->GetDecalTransparencyColor() +#define IDirect3DRMTexture2_GetDecalTransparentColor(p) (p)->GetDecalTransparentColor() /*** IDirect3DRMTexture2 methods ***/ #define IDirect3DRMTexture2_InitFromImage(p,a) (p)->InitFromImage(a) #define IDirect3DRMTexture2_InitFromResource2(p,a,b,c) (p)->InitFromResource2(a,b,c) @@ -3494,7 +3494,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture3_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3502,7 +3502,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_GetColors(p) (p)->lpVtbl->GetColors(p) #define IDirect3DRMTexture3_GetDecalScale(p) (p)->lpVtbl->GetDecalScale(p) #define IDirect3DRMTexture3_GetDecalTransparency(p) (p)->lpVtbl->GetDecalTransparency(p) -#define IDirect3DRMTexture3_GetDecalTransparencyColor(p) (p)->lpVtbl->GetDecalTransparencyColor(p) +#define IDirect3DRMTexture3_GetDecalTransparentColor(p) (p)->lpVtbl->GetDecalTransparentColor(p) #define IDirect3DRMTexture3_InitFromImage(p,a) (p)->lpVtbl->InitFromImage(p,a) #define IDirect3DRMTexture3_InitFromResource2(p,a,b,c) (p)->lpVtbl->InitFromResource2(p,a,b,c) #define IDirect3DRMTexture3_GenerateMIPMap(p,a) (p)->lpVtbl->GenerateMIPMap(p,a)

1 0

Henri Verbeet : d2d1: Avoid leaking "object" on an error path in d2d_factory_CreateWicBitmapRenderTarget() (Coverity).
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaa571c5d7dd59dd28fd1f25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:49 2015 +0200 d2d1: Avoid leaking "object" on an error path in d2d_factory_CreateWicBitmapRenderTarget() (Coverity). --- dlls/d2d1/factory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 24407f7..d63add5 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -239,6 +239,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->wic_device))) { WARN("Failed to create device, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Michael Müller : wininet: Set Host header in HttpSendRequestW instead of HttpOpenRequestW.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 7bed453481ef76068c6103d2d2b533f26c1c43a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bed453481ef76068c6103d2d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 25 07:26:43 2015 +0200 wininet: Set Host header in HttpSendRequestW instead of HttpOpenRequestW. --- dlls/wininet/http.c | 25 ++++++++++++------------- dlls/wininet/tests/http.c | 8 ++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5dd1b3b..edea9f8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -376,6 +376,7 @@ static WCHAR *get_host_header( http_request_t *req ) EnterCriticalSection( &req->headers_section ); if ((header = HTTP_GetHeader( req, hostW ))) ret = heap_strdupW( header->lpszValue ); + else ret = heap_strdupW( req->server->canon_host_port ); LeaveCriticalSection( &req->headers_section ); return ret; } @@ -1886,20 +1887,21 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; static const WCHAR slash[] = { '/',0 }; LPHTTPHEADERW host_header; + const WCHAR *host; LPCWSTR scheme; - host_header = HTTP_GetHeader(req, hostW); - if(!host_header) - return FALSE; - EnterCriticalSection( &req->headers_section ); + host_header = HTTP_GetHeader(req, hostW); + if (host_header) host = host_header->lpszValue; + else host = req->server->canon_host_port; + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) scheme = https; else scheme = http; strcpyW(buf, scheme); - strcatW(buf, host_header->lpszValue); + strcatW(buf, host); if (req->path[0] != '/') strcatW(buf, slash); strcatW(buf, req->path); @@ -2140,16 +2142,12 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_URL: { static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; WCHAR url[INTERNET_MAX_URL_LENGTH]; - HTTPHEADERW *host; TRACE("INTERNET_OPTION_URL\n"); - EnterCriticalSection( &req->headers_section ); - host = HTTP_GetHeader(req, hostW); strcpyW(url, httpW); - strcatW(url, host->lpszValue); + strcatW(url, req->server->canon_host_port); strcatW(url, req->path); - LeaveCriticalSection( &req->headers_section ); TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); return str_to_buffer(url, buffer, size, unicode); @@ -3417,8 +3415,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); - HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request ); @@ -4911,6 +4907,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!request->verb) request->verb = heap_strdupW(szGET); + HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, + HTTP_ADDREQ_FLAG_ADD_IF_NEW | HTTP_ADDHDR_FLAG_REQ); + if (dwContentLength || strcmpW(request->verb, szGET)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); @@ -5121,7 +5120,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, dwBufferSize=2048; if (request->status_code == HTTP_STATUS_DENIED) { - WCHAR *host = get_host_header( request ); + WCHAR *host = heap_strdupW( request->server->canon_host_port ); DWORD dwIndex = 0; while (HTTP_HttpQueryInfoW(request,HTTP_QUERY_WWW_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex) == ERROR_SUCCESS) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6b018de..14998f2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2979,8 +2979,8 @@ static void test_header_override(int port) memset(buffer, 0, sizeof(buffer)); ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); err = GetLastError(); - todo_wine ok(!ret, "HttpQueryInfo succeeded\n"); - todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); size = sizeof(buffer) - 1; memset(buffer, 0, sizeof(buffer)); @@ -3001,12 +3001,12 @@ static void test_header_override(int port) memset(buffer, 0, sizeof(buffer)); ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); ok(ret, "InternetQueryOption failed\n"); - todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - test_status_code_todo(req, 200); + test_status_code(req, 200); InternetCloseHandle(req); req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);

1 0

Martin Storsjo : ucrtbase: Add the new universal CRT DLL.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 599d92a26822244b9703734a6a8972a0009cdf09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d92a26822244b9703734a6… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Aug 24 11:37:12 2015 +0300 ucrtbase: Add the new universal CRT DLL. --- configure | 2 + configure.ac | 1 + dlls/ucrtbase/Makefile.in | 32 + dlls/ucrtbase/ucrtbase.spec | 2598 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2633 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=599d92a26822244b97037…

1 0

Zhenbo Li : mshtml: Add IHTMLOptionElement:: defaultSelected property implementation.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 85c31979de75ad25932d7305d2eaef9148afad5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c31979de75ad25932d7305d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 22 21:16:35 2015 +0800 mshtml: Add IHTMLOptionElement::defaultSelected property implementation. --- dlls/mshtml/htmloption.c | 46 ++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 54d872c..802e85a 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -166,15 +166,53 @@ static HRESULT WINAPI HTMLOptionElement_get_value(IHTMLOptionElement *iface, BST static HRESULT WINAPI HTMLOptionElement_put_defaultSelected(IHTMLOptionElement *iface, VARIANT_BOOL v) { HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + cpp_bool val, selected; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + val = (v == VARIANT_TRUE); + + nsres = nsIDOMHTMLOptionElement_GetSelected(This->nsoption, &selected); + if(NS_FAILED(nsres)) { + ERR("GetSelected failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLOptionElement_SetDefaultSelected(This->nsoption, val); + if(NS_FAILED(nsres)) { + ERR("SetDefaultSelected failed: %08x\n", nsres); + return E_FAIL; + } + + if(val != selected) { + nsres = nsIDOMHTMLOptionElement_SetSelected(This->nsoption, selected); /* WinAPI will reserve selected property */ + if(NS_FAILED(nsres)) { + ERR("SetSelected failed: %08x\n", nsres); + return E_FAIL; + } + } + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_get_defaultSelected(IHTMLOptionElement *iface, VARIANT_BOOL *p) { HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_POINTER; + nsres = nsIDOMHTMLOptionElement_GetDefaultSelected(This->nsoption, &val); + if(NS_FAILED(nsres)) { + ERR("GetDefaultSelected failed: %08x\n", nsres); + return E_FAIL; + } + + *p = val ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLOptionElement_put_index(IHTMLOptionElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 55b64ef..c7e5e7c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1692,6 +1692,60 @@ static void _test_option_get_index(unsigned line, IHTMLOptionElement *option, LO "value = %d, expected = %d\n", val, exval); } +#define test_option_put_defaultSelected(o,d) _test_option_put_defaultSelected(__LINE__,o,d) +static void _test_option_put_defaultSelected(unsigned line, IHTMLOptionElement *option, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLOptionElement_put_defaultSelected(option, b); + ok_(__FILE__,line)(hres == S_OK, "put_defaultSelected %08x\n", hres); +} + +#define test_option_defaultSelected(o,e) _test_option_defaultSelected(__LINE__,o,e) +static void _test_option_defaultSelected(unsigned line, IHTMLOptionElement *option, VARIANT_BOOL ex) +{ + HRESULT hres; + VARIANT_BOOL b; + + hres = IHTMLOptionElement_get_defaultSelected(option, NULL); + ok_(__FILE__,line)(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + + b = 0x100; + hres = IHTMLOptionElement_get_defaultSelected(option, &b); + ok_(__FILE__,line)(hres == S_OK, "get_defaultSelected failed: %08x\n", hres); + ok_(__FILE__,line)(b == ex, "b = %x, expected = %x\n", b, ex); +} + +static void test_option_defaultSelected_property(IHTMLOptionElement *option) +{ + test_option_defaultSelected(option, VARIANT_FALSE); + test_option_selected(option, VARIANT_FALSE); + + test_option_put_defaultSelected(option, 0x100); /* Invalid value */ + test_option_defaultSelected(option, VARIANT_FALSE); + test_option_selected(option, VARIANT_FALSE); + + test_option_put_defaultSelected(option, VARIANT_TRUE); + test_option_defaultSelected(option, VARIANT_TRUE); + test_option_selected(option, VARIANT_FALSE); + + test_option_put_defaultSelected(option, 0x100); /* Invalid value */ + test_option_defaultSelected(option, VARIANT_FALSE); + test_option_selected(option, VARIANT_FALSE); + + test_option_put_selected(option, VARIANT_TRUE); + test_option_selected(option, VARIANT_TRUE); + test_option_defaultSelected(option, VARIANT_FALSE); + + test_option_put_defaultSelected(option, VARIANT_TRUE); + test_option_defaultSelected(option, VARIANT_TRUE); + test_option_selected(option, VARIANT_TRUE); + + /* Restore defaultSelected */ + test_option_put_defaultSelected(option, VARIANT_TRUE); + test_option_put_selected(option, VARIANT_FALSE); +} + #define test_textarea_value(t,v) _test_textarea_value(__LINE__,t,v) static void _test_textarea_value(unsigned line, IUnknown *unk, const char *exval) { @@ -5085,6 +5139,7 @@ static void test_create_option_elem(IHTMLDocument2 *doc) test_option_put_text(option, "new text"); test_option_put_value(option, "new value"); test_option_get_index(option, 0); + test_option_defaultSelected_property(option); test_option_put_selected(option, VARIANT_TRUE); test_option_put_selected(option, VARIANT_FALSE);

1 0

Zhenbo Li : mshtml: Add IHTMLOptionElement::form property implementation.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: e8c687857b0860c838d26bc04d92384e1c1486b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c687857b0860c838d26bc04… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 22 21:16:49 2015 +0800 mshtml: Add IHTMLOptionElement::form property implementation. --- dlls/mshtml/htmloption.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 802e85a..94af281 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -307,8 +307,42 @@ static HRESULT WINAPI HTMLOptionElement_get_text(IHTMLOptionElement *iface, BSTR static HRESULT WINAPI HTMLOptionElement_get_form(IHTMLOptionElement *iface, IHTMLFormElement **p) { HTMLOptionElement *This = impl_from_IHTMLOptionElement(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 = nsIDOMHTMLOptionElement_GetForm(This->nsoption, &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 const IHTMLOptionElementVtbl HTMLOptionElementVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c7e5e7c..61d5de9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -891,6 +891,17 @@ static IHTMLSelectElement *_get_select_iface(unsigned line, IUnknown *unk) return select; } +#define get_option_iface(u) _get_option_iface(__LINE__,u) +static IHTMLOptionElement *_get_option_iface(unsigned line, IUnknown *unk) +{ + IHTMLOptionElement *option; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLOptionElement, (void**)&option); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + return option; +} + #define get_form_iface(u) _get_form_iface(__LINE__,u) static IHTMLFormElement *_get_form_iface(unsigned line, IUnknown *unk) { @@ -5146,6 +5157,25 @@ static void test_create_option_elem(IHTMLDocument2 *doc) IHTMLOptionElement_Release(option); } +static void test_option_form(IUnknown *uoption, IUnknown *uform) +{ + IHTMLOptionElement *option = get_option_iface(uoption); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLOptionElement_get_form(option, NULL); + ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + + hres = IHTMLOptionElement_get_form(option, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form != NULL, "form == NULL\n"); + + ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); + + IHTMLOptionElement_Release(option); + IHTMLFormElement_Release(form); +} + static void test_create_img_elem(IHTMLDocument2 *doc) { IHTMLImgElement *img; @@ -8582,12 +8612,18 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\" name=\"form_name\"><select id=\"sform\"></select></form>"); + "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></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); + + elem = get_elem_by_id(doc, "oform", TRUE); + if(elem) { + test_option_form((IUnknown*)elem, (IUnknown*)elem2); + IHTMLElement_Release(elem); + } IHTMLElement_Release(elem2); }

1 0

Zhenbo Li : mshtml/tests: Fix crash on win2000 testbot.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: f1c3f7ff1c04e26f95ffb59d723cf7d6ac95fff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c3f7ff1c04e26f95ffb59d7… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 22 21:18:16 2015 +0800 mshtml/tests: Fix crash on win2000 testbot. --- dlls/mshtml/tests/xmlhttprequest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index b880df6..0997206 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -805,6 +805,9 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) trace("abort before send() is fired\n"); create_xmlhttprequest(doc); + if(!xhr) + return; + V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var);

1 0

Daniel Lehman : kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 5bf1423c2c5c081109848d8ac629796b4fbc432c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf1423c2c5c081109848d8ac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 17 14:36:19 2015 -0700 kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale. --- dlls/kernel32/locale.c | 3 +++ dlls/kernel32/tests/locale.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eaf1183..c0a66ef 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2513,6 +2513,9 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) switch (lcid) { + case LOCALE_INVARIANT: + /* keep as-is */ + break; case LOCALE_SYSTEM_DEFAULT: lcid = GetSystemDefaultLCID(); break; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 86adcdb..51e2b07 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3132,6 +3132,9 @@ static void test_ConvertDefaultLocale(void) LCID_RES(LOCALE_SYSTEM_DEFAULT, GetSystemDefaultLCID()); LCID_RES(LOCALE_USER_DEFAULT, GetUserDefaultLCID()); LCID_RES(LOCALE_NEUTRAL, GetUserDefaultLCID()); + lcid = ConvertDefaultLocale(LOCALE_INVARIANT); + ok(lcid == LOCALE_INVARIANT || broken(lcid == 0x47f) /* win2k[3]/winxp */, + "Expected lcid = %08x, got %08x\n", LOCALE_INVARIANT, lcid); } static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName,

1 0

Sebastian Lackner : notepad: New files should be created immediately.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 8a730168196d45f4364473b93e73bd74ad4378ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a730168196d45f4364473b93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 25 06:57:58 2015 +0200 notepad: New files should be created immediately. --- programs/notepad/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 480f866..20e887b 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -702,9 +702,18 @@ static void HandleCommandLine(LPWSTR cmdline) { switch (AlertFileDoesNotExist(file_name)) { case IDYES: + { + + HANDLE file; SetFileNameAndEncoding(file_name, ENCODING_ANSI); + + file = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + UpdateWindowCaption(); break; + } case IDNO: break;

1 0