September 2014 - Wine-Commits

Alistair Leslie-Hughes : dpvoice: Add IDirectPlayVoiceTest stub interface.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: a192e7f11b6ac34e2173f5677674b4572c9fe0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a192e7f11b6ac34e2173f5677… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 26 09:01:15 2014 +1000 dpvoice: Add IDirectPlayVoiceTest stub interface. --- dlls/dpvoice/client.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/main.c | 1 + dlls/dpvoice/tests/voice.c | 25 ++++++++++++- 4 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 68d631c..0fab0c5 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -41,11 +41,22 @@ typedef struct IDirectPlayVoiceClientImpl LONG ref; } IDirectPlayVoiceClientImpl; +typedef struct IDirectPlayVoiceTestImpl +{ + IDirectPlayVoiceTest IDirectPlayVoiceTest_iface; + LONG ref; +} IDirectPlayVoiceTestImpl; + static inline IDirectPlayVoiceClientImpl *impl_from_IDirectPlayVoiceClient(IDirectPlayVoiceClient *iface) { return CONTAINING_RECORD(iface, IDirectPlayVoiceClientImpl, IDirectPlayVoiceClient_iface); } +static inline IDirectPlayVoiceTestImpl *impl_from_IDirectPlayVoiceTest(IDirectPlayVoiceTest *iface) +{ + return CONTAINING_RECORD(iface, IDirectPlayVoiceTestImpl, IDirectPlayVoiceTest_iface); +} + static HRESULT WINAPI dpvclient_QueryInterface(IDirectPlayVoiceClient *iface, REFIID riid, void **ppv) { if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlayVoiceClient)) @@ -232,3 +243,78 @@ HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnk return ret; } + +static HRESULT WINAPI dpvtest_QueryInterface(IDirectPlayVoiceTest *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlayVoiceTest)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const GUID *pguidPlaybackDevice, const GUID *pguidCaptureDevice, + HWND hwndParent, DWORD dwFlags) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + FIXME("%p %p %p %p %d\n", This, pguidPlaybackDevice, pguidCaptureDevice, hwndParent, dwFlags); + return E_NOTIMPL; +} + +static const IDirectPlayVoiceTestVtbl DirectPlayVoiceTest_Vtbl = +{ + dpvtest_QueryInterface, + dpvtest_AddRef, + dpvtest_Release, + dpvtest_CheckAudioSetup +}; + +HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) +{ + IDirectPlayVoiceTestImpl* test; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + test = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlayVoiceTestImpl)); + if (!test) + return E_OUTOFMEMORY; + + test->IDirectPlayVoiceTest_iface.lpVtbl = &DirectPlayVoiceTest_Vtbl; + test->ref = 1; + + ret = IDirectPlayVoiceTest_QueryInterface(&test->IDirectPlayVoiceTest_iface, riid, ppobj); + IDirectPlayVoiceTest_Release(&test->IDirectPlayVoiceTest_iface); + + return ret; +} diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index 0ee2658..5b0e57d 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -22,5 +22,6 @@ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 608d1cd..aab0859 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -96,6 +96,7 @@ static IClassFactoryImpl DPVOICE_CFS[] = { { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceClient, DPVOICE_CreateDirectPlayVoiceClient }, { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceServer, DPVOICE_CreateDirectPlayVoiceServer }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceTest, DPVOICE_CreateDirectPlayVoiceTest }, { { NULL }, 0, NULL, NULL } }; diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 4d950bd..883c684 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -239,7 +239,7 @@ static BOOL test_init_dpvoice_client(void) /* See if we can get the default values from the registry and try again. */ hr = CoCreateInstance(&CLSID_DirectPlayVoiceTest, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceTest, (void **)&voicetest); - todo_wine ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr); if(hr == S_OK) { hr = IDirectPlayVoiceTest_CheckAudioSetup(voicetest, &DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoiceCapture, @@ -322,6 +322,27 @@ static void test_cleanup_dpvoice(void) } } +static void create_voicetest(void) +{ + HRESULT hr; + IDirectPlayVoiceTest *voicetest; + + hr = CoCreateInstance(&CLSID_DirectPlayVoiceTest, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceTest, (void **)&voicetest); + if(hr == S_OK) + { + hr = IDirectPlayVoiceTest_CheckAudioSetup(voicetest, &DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoiceCapture, + NULL, DVFLAGS_QUERYONLY); + todo_wine ok(hr == S_OK || hr == DVERR_RUNSETUP, "CheckAudioSetup failed with 0x%08x\n", hr); + + IDirectPlayVoiceTest_Release(voicetest); + } + else + { + /* Everything after Windows XP doesnt have dpvoice installed. */ + win_skip("IDirectPlayVoiceClient not supported on thie platform\n"); + } +} + START_TEST(voice) { HRESULT hr; @@ -331,6 +352,8 @@ START_TEST(voice) if(hr != S_OK) return; + create_voicetest(); + if(test_init_dpvoice_server() && test_init_dpvoice_client()) { /* TODO */

1 0

Jacek Caban : mshtml: Use UTF-8 encoding in NewURI by default.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 857a35e2a7628058d46489918dc2c4eb529ea61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=857a35e2a7628058d46489918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:38:59 2014 +0200 mshtml: Use UTF-8 encoding in NewURI by default. --- dlls/mshtml/nsio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9335428..b5c766c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3343,7 +3343,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } - MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8")) + FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset)); + + MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);

1 0

Jacek Caban : mshtml: Don't share nsimg reference with nsnode.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 23fc0dc8e854cbebc9e1b77eebf90974eb82739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fc0dc8e854cbebc9e1b77ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:28 2014 +0200 mshtml: Don't share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 8c1d324..57eaa7e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -686,6 +686,26 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLImgElement_get_readyState(&This->IHTMLImgElement_iface, p); } +static void HTMLImgElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) + note_cc_edge((nsISupports*)This->nsimg, "This->nsimg", cb); +} + +static void HTMLImgElement_unlink(HTMLDOMNode *iface) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) { + nsIDOMHTMLImageElement *nsimg = This->nsimg; + + This->nsimg = NULL; + nsIDOMHTMLImageElement_Release(nsimg); + } +} + static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, HTMLElement_destructor, @@ -698,7 +718,12 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { NULL, NULL, NULL, - HTMLImgElement_get_readystate + HTMLImgElement_get_readystate, + NULL, + NULL, + NULL, + HTMLImgElement_traverse, + HTMLImgElement_unlink }; static const tid_t HTMLImgElement_iface_tids[] = { @@ -728,10 +753,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - - /* Share nsimg reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Alistair Leslie-Hughes : dpnet: Show SetSP adds a component.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: f23b46464e074665af54cf4cee98427f2900fde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23b46464e074665af54cf4ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 26 13:28:53 2014 +1000 dpnet: Show SetSP adds a component. --- dlls/dpnet/address.c | 3 +++ dlls/dpnet/tests/address.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6add842..2cea1ea 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -259,6 +259,9 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(IDirectPlay8Address *iface, This->init = TRUE; This->SP_guid = *pguidSP; + + IDirectPlay8Address_AddComponent(iface, DPNA_KEY_PROVIDER, &This->SP_guid, sizeof(GUID), DPNA_DATATYPE_GUID); + return DPN_OK; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 2d38d8c..4d825bb 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -171,6 +171,49 @@ static void address_addcomponents(void) } } +static void address_setsp(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + DWORD components; + WCHAR *name; + GUID guid = IID_Random; + DWORD type; + DWORD namelen = 0; + DWORD bufflen = 0; + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 0, "components=%d", components); + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 1, "components=%d", components); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + + name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, name, &namelen, (void*)&guid, &bufflen, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); + todo_wine ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + + HeapFree(GetProcessHeap(), 0, name); + + IDirectPlay8Address_Release(localaddr); + } +} + START_TEST(address) { HRESULT hr; @@ -182,6 +225,7 @@ START_TEST(address) create_directplay_address(); address_addcomponents(); + address_setsp(); CoUninitialize(); }

1 0

Hans Leidekker : wininet: Protect the request headers array with a critical section.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: 462f56d468984d2d2a3bf3ae21771b64c206eec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462f56d468984d2d2a3bf3ae2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 14:21:37 2014 +0200 wininet: Protect the request headers array with a critical section. --- dlls/wininet/http.c | 181 ++++++++++++++++++++++++++++++++++++++-------- dlls/wininet/internet.h | 3 + dlls/wininet/tests/http.c | 50 +++++++++++++ 3 files changed, 205 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=462f56d468984d2d2a3bf…

1 0

Alexandre Julliard : secur32/tests: Update test for the new certificate on winehq.org.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: 0ff2fb8a4f93e4860df839ac9a4873858c85bceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff2fb8a4f93e4860df839ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 25 16:08:05 2014 +0200 secur32/tests: Update test for the new certificate on winehq.org. --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2b68c3d..e868b13 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -517,7 +517,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Stefan Dösinger : d3d8: Return the correct value in CreateAdditionalSwapChain.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: 92bcb7476821c0911d9868a4939b069ed11728cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bcb7476821c0911d9868a49… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 25 14:24:17 2014 +0200 d3d8: Return the correct value in CreateAdditionalSwapChain. --- dlls/d3d8/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2e74a41..8ddb0cb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -557,16 +557,17 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; + HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); - if (SUCCEEDED(d3d8_swapchain_create(device, &desc, &object))) + if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); - return D3D_OK; + return hr; } static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource)

1 0

Hans Leidekker : wininet/tests: Update test data to match the new certificate on winehq.org.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: bbfae5be4b34995e66a92f553e2a8c71ce52f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfae5be4b34995e66a92f553… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 14:21:06 2014 +0200 wininet/tests: Update test data to match the new certificate on winehq.org. --- dlls/wininet/tests/http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ad6622c..e7c3e17 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4180,15 +4180,14 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "6JcR7G3G8tgjkeoMcitK-bTbzcpumDSy\r\n" "GT98380011\r\n" "See www.rapidssl.com/resources/cps (c)14\r\n" "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" - "\"GeoTrust, Inc.\"\r\n" - "RapidSSL CA" + "GeoTrust Inc.\r\n" + "RapidSSL SHA256 CA - G3" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Jacek Caban : mshtml: Don't share nstable reference with nsnode.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: e5e0fc30190f31d7bfa00b8160cf042ab78d83cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e0fc30190f31d7bfa00b816… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:42 2014 +0200 mshtml: Don't share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index d938699..8e64efa 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -993,6 +993,26 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLTable_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) + note_cc_edge((nsISupports*)This->nstable, "This->nstable", cb); +} + +static void HTMLTable_unlink(HTMLDOMNode *iface) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) { + nsIDOMHTMLTableElement *nstable = This->nstable; + + This->nstable = NULL; + nsIDOMHTMLTableElement_Release(nstable); + } +} + static const cpc_entry_t HTMLTable_cpc[] = { {&DIID_HTMLTableEvents}, HTMLELEMENT_CPC, @@ -1005,7 +1025,18 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTable_traverse, + HTMLTable_unlink }; static const tid_t HTMLTable_iface_tids[] = { @@ -1040,10 +1071,7 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - - /* Share the reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : ieframe: Added partial Refresh2 implementation.
by Alexandre Julliard Sept. 25, 2014

Sept. 25, 2014

Module: wine Branch: master Commit: c1acf1647b505460baa5cb3891926358f0677cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1acf1647b505460baa5cb389… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 13:38:24 2014 +0200 ieframe: Added partial Refresh2 implementation. --- dlls/ieframe/dochost.c | 5 ++++- dlls/ieframe/ie.c | 8 +++++--- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/tests/webbrowser.c | 21 +++++++++++++++++---- dlls/ieframe/webbrowser.c | 8 +++++--- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 8c5d4b5..c76e91c 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -532,12 +532,15 @@ void deactivate_document(DocHost *This) This->document = NULL; } -HRESULT refresh_document(DocHost *This) +HRESULT refresh_document(DocHost *This, const VARIANT *level) { IOleCommandTarget *cmdtrg; VARIANT vin, vout; HRESULT hres; + if(level && (V_VT(level) != VT_I4 || V_I4(level) != REFRESH_NORMAL)) + FIXME("Unsupported refresh level %s\n", debugstr_variant(level)); + if(!This->document) { FIXME("no document\n"); return E_FAIL; diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 5eb1d26..12be68e 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -182,14 +182,16 @@ static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, Level); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Level); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI InternetExplorer_Stop(IWebBrowser2 *iface) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 063832d..93be1fe 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -265,7 +265,7 @@ HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VAR HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; HRESULT go_forward(DocHost*) DECLSPEC_HIDDEN; -HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*,const VARIANT*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 12b349f..0ddd360 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2835,15 +2835,27 @@ static void test_download(DWORD flags) CLEAR_CALLED(QueryStatus_STOP); } -static void test_Refresh(IWebBrowser2 *webbrowser) +static void test_Refresh(IWebBrowser2 *webbrowser, BOOL use_refresh2) { HRESULT hres; trace("Refresh...\n"); SET_EXPECT(Exec_DocHostCommandHandler_2300); - hres = IWebBrowser2_Refresh(webbrowser); - ok(hres == S_OK, "Refresh failed: %08x\n", hres); + + if(use_refresh2) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = REFRESH_NORMAL; + + hres = IWebBrowser2_Refresh2(webbrowser, &v); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + }else { + hres = IWebBrowser2_Refresh(webbrowser); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + } + CHECK_CALLED(Exec_DocHostCommandHandler_2300); test_download(DWL_REFRESH); @@ -3423,7 +3435,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Navigate2(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_EXPECT_BEFORE_NAVIGATE|DWL_HTTP); - test_Refresh(webbrowser); + test_Refresh(webbrowser, FALSE); + test_Refresh(webbrowser, TRUE); trace("put_href http URL...\n"); test_put_href(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 55f757f..a3233e1 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -296,14 +296,16 @@ static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(Level)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(Level)); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface)

1 0