April 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : server: Add support for NtTerminateProcess(0).
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: b92c82c9426c3315ef156027429c8c0a15e3a521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92c82c9426c3315ef1560274… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:21:21 2013 +0900 server: Add support for NtTerminateProcess(0). --- dlls/kernel32/tests/loader.c | 17 +++-------------- dlls/ntdll/process.c | 2 +- server/process.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c88a995..ddf6fb3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1105,12 +1105,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } if (test_dll_phase == 2) @@ -1230,7 +1225,6 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); status = pNtTerminateProcess(0, 195); - todo_wine ok(!status, "NtTerminateProcess error %#x\n", status); ret = pRtlDllShutdownInProgress(); @@ -1239,7 +1233,7 @@ static void child_process(const char *dll_name, DWORD target_offset) break; case 1: - case 2: /* ExitProcces will be called by PROCESS_DETACH handler */ + case 2: /* ExitProcess will be called by PROCESS_DETACH handler */ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1283,12 +1277,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = GetExitCodeThread(attached_thread[i], &code); trace("child: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } *child_failures = winetest_get_failures(); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a39f5d0..88a9e41 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -60,7 +60,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self) exit( exit_code ); + if (self && handle) exit( exit_code ); return ret; } diff --git a/server/process.c b/server/process.c index 4f04a23..74a289a 100644 --- a/server/process.c +++ b/server/process.c @@ -1082,12 +1082,16 @@ DECL_HANDLER(terminate_process) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) + if (req->handle) { - reply->self = (current->process == process); - terminate_process( process, current, req->exit_code ); - release_object( process ); + process = get_process_from_handle( req->handle, PROCESS_TERMINATE ); + if (!process) return; } + else process = (struct process *)grab_object( current->process ); + + reply->self = (current->process == process); + terminate_process( process, current, req->exit_code ); + release_object( process ); } /* fetch information about a process */

1 0

Piotr Caban : wininet: Fixed Cache-Content: no-cache tests.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 0d50e86f6abb27e5de643b2de4ece28489374000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d50e86f6abb27e5de643b2de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 15 14:58:25 2013 +0200 wininet: Fixed Cache-Content: no-cache tests. --- dlls/wininet/tests/http.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 968f9e4..031efb1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1826,6 +1826,7 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; static int test_b = 0; + static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2018,7 +2019,10 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /test_cache_control_no_cache")) { static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; - send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + if(!test_no_cache++) + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + else + send(c, okmsg, sizeof(okmsg)-1, 0); } if (strstr(buffer, "GET /test_cache_control_no_store")) { @@ -2517,8 +2521,17 @@ static void test_no_cache(int port) ok(size == 12, "read %d bytes of data\n", size); InternetCloseHandle(req); - ret = DeleteUrlCacheEntry(cache_url); - ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 0, "read %d bytes of data\n", size); + InternetCloseHandle(req); + DeleteUrlCacheEntry(cache_url); req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMANIMATIONKEY.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: cbf57825456815a0b3ac5e8a49a88aa810d517dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf57825456815a0b3ac5e8a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:55 2013 +0200 d3drm: Avoid LPD3DRMANIMATIONKEY. --- include/d3drmobj.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index ea09186..cd30911 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3879,11 +3879,9 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD_(D3DRMANIMATIONOPTIONS, GetOptions)(THIS) PURE; STDMETHOD(GetFrame)(THIS_ LPDIRECT3DRMFRAME3 *lpD3DFrame) PURE; STDMETHOD(DeleteKeyByID)(THIS_ DWORD dwID) PURE; - STDMETHOD(AddKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(ModifyKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(GetKeys)(THIS_ D3DVALUE dvTimeMin, - D3DVALUE dvTimeMax, LPDWORD lpdwNumKeys, - LPD3DRMANIMATIONKEY lpKey); + STDMETHOD(AddKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(ModifyKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(GetKeys)(THIS_ D3DVALUE time_min, D3DVALUE time_max, DWORD *key_count, D3DRMANIMATIONKEY *keys); }; #undef INTERFACE

1 0

Jacek Caban : ieframe: Return document as IHTMLDocument2 iface from get_document.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: b93e61acf143e8f6e04c6b5a4c6e8470fe9c1900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93e61acf143e8f6e04c6b5a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:41:32 2013 +0200 ieframe: Return document as IHTMLDocument2 iface from get_document. --- dlls/ieframe/tests/webbrowser.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 753a1680..47d0fbc 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -277,7 +277,7 @@ static void _test_ready_state(unsigned line, READYSTATE exstate) } #define get_document(u) _get_document(__LINE__,u) -static IDispatch *_get_document(unsigned line, IWebBrowser2 *wb) +static IHTMLDocument2 *_get_document(unsigned line, IWebBrowser2 *wb) { IHTMLDocument2 *html_doc; IDispatch *disp; @@ -291,22 +291,22 @@ static IDispatch *_get_document(unsigned line, IWebBrowser2 *wb) hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc); ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument iface: %08x\n", hres); ok(disp == (IDispatch*)html_doc, "disp != html_doc\n"); - IHTMLDocument2_Release(html_doc); + IDispatch_Release(disp); - return disp; + return html_doc; } #define get_dochost(u) _get_dochost(__LINE__,u) static IOleClientSite *_get_dochost(unsigned line, IWebBrowser2 *unk) { IOleClientSite *client_site; + IHTMLDocument2 *doc; IOleObject *oleobj; - IDispatch *doc; HRESULT hres; doc = _get_document(line, unk); - hres = IDispatch_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - IDispatch_Release(doc); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + IHTMLDocument2_Release(doc); ok_(__FILE__,line)(hres == S_OK, "Got 0x%08x\n", hres); hres = IOleObject_GetClientSite(oleobj, &client_site); @@ -2895,15 +2895,10 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) { IHTMLLocation *location; IHTMLDocument2 *doc; - IDispatch *doc_disp; BSTR str; HRESULT hres; - doc_disp = get_document(unk); - - hres = IDispatch_QueryInterface(doc_disp, &IID_IHTMLDocument2, (void**)&doc); - IDispatch_Release(doc_disp); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2 failed: %08x\n", hres); + doc = get_document(unk); location = NULL; hres = IHTMLDocument2_get_location(doc, &location); @@ -3019,12 +3014,12 @@ static void test_QueryInterface(IWebBrowser2 *wb) static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) { IOleDocumentView *docview; - IDispatch *disp; + IHTMLDocument2 *doc; HRESULT hres; - disp = get_document(unk); + doc = get_document(unk); - hres = IDispatch_QueryInterface(disp, &IID_IOleDocumentView, (void**)&docview); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleDocumentView, (void**)&docview); ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { if(activate) { @@ -3052,7 +3047,7 @@ static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) IOleDocumentView_Release(docview); } - IDispatch_Release(disp); + IHTMLDocument2_Release(doc); } static void test_external(IWebBrowser2 *unk) @@ -3361,7 +3356,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_ExecWB(webbrowser, TRUE, TRUE); if(do_download) { - IDispatch *doc, *doc2; + IHTMLDocument2 *doc, *doc2; test_download(0); test_olecmd(webbrowser, TRUE); @@ -3371,15 +3366,15 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_PUT_HREF); doc2 = get_document(webbrowser); ok(doc == doc2, "doc != doc2\n"); - IDispatch_Release(doc2); + IHTMLDocument2_Release(doc2); trace("Navigate2 repeated...\n"); test_Navigate2(webbrowser, "about:blank"); test_download(DWL_EXPECT_BEFORE_NAVIGATE); doc2 = get_document(webbrowser); ok(doc == doc2, "doc != doc2\n"); - IDispatch_Release(doc2); - IDispatch_Release(doc); + IHTMLDocument2_Release(doc2); + IHTMLDocument2_Release(doc); if(!do_close) { trace("Navigate2 http URL...\n");

1 0

Stefan Dösinger : wined3d: Don' t hardcode the ps_1_3 sampler limit in find_ps_compile_args.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 76234750a5dfdcac182f2b77bc71289d8fcd8300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76234750a5dfdcac182f2b77b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:17 2013 +0200 wined3d: Don't hardcode the ps_1_3 sampler limit in find_ps_compile_args. --- dlls/wined3d/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0431c1f..3aec36c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2011,7 +2011,7 @@ void find_ps_compile_args(const struct wined3d_state *state, if (shader->reg_maps.shader_version.major == 1 && shader->reg_maps.shader_version.minor <= 3) { - for (i = 0; i < 4; ++i) + for (i = 0; i < shader->limits.sampler; ++i) { DWORD flags = state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS];

1 0

Stefan Dösinger : wined3d: 1x1 texures have a power of two size.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 196c88cfc4ad4d14a8e6091aa59111aa511ee31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=196c88cfc4ad4d14a8e6091aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 12 14:12:40 2013 +0200 wined3d: 1x1 texures have a power of two size. --- dlls/wined3d/texture.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9bf4c2e..5b83d4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -965,15 +965,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { - if (width != 1 || height != 1) - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip;

1 0

Rico Schüller : d3d8: Don' t assert on invalid IDirect3DBaseTexture8 interfaces.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 1486bdd99ff0d0d7fa39042517736d645ce02675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1486bdd99ff0d0d7fa3904251… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 14 16:53:37 2013 +0200 d3d8: Don't assert on invalid IDirect3DBaseTexture8 interfaces. --- dlls/d3d8/texture.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f139d4e..07695f9 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,9 +1155,20 @@ struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture { if (!iface) return NULL; - assert(iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl); + + /* SetTexture() in particular doesn't do a lot of validation on the pointer + * that gets passed in, and passing an invalid pointer works as long as the + * application doesn't try to actually render anything with it, so we print + * a WARN and return NULL instead of having the usual assert() here. + * One application affected by this is Fishdom 2. */ + if (iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl) + { + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); + return NULL; + } + return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface); }

1 0

Hans Leidekker : msi: Don't overwrite verstr in set_installer_properties.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: ca025a525d50f253a7e450b8ac01898f1f02eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca025a525d50f253a7e450b8a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 15 10:25:34 2013 +0200 msi: Don't overwrite verstr in set_installer_properties. --- dlls/msi/package.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bcda102..6b3d16c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -873,10 +873,10 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szMsiNTProductType, verstr, len ); break; } - len = sprintfW( verstr, szFormat, OSVersion.dwBuildNumber ); - msi_set_property( package->db, szWindowsBuild, verstr, len ); - len = sprintfW( verstr, szFormat, OSVersion.wServicePackMajor ); - msi_set_property( package->db, szServicePackLevel, verstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.dwBuildNumber ); + msi_set_property( package->db, szWindowsBuild, bufstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.wServicePackMajor ); + msi_set_property( package->db, szServicePackLevel, bufstr, len ); len = sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION ); msi_set_property( package->db, szVersionMsi, bufstr, len );

1 0

Jacek Caban : ieframe: Added IConnectionPoint:: EnumConnections implementation.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: e8efc1e630ede221d87301c16dd72028aa886bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8efc1e630ede221d87301c16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:41:17 2013 +0200 ieframe: Added IConnectionPoint::EnumConnections implementation. --- dlls/ieframe/events.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/events.c b/dlls/ieframe/events.c index 5a426ab..eef1c17 100644 --- a/dlls/ieframe/events.c +++ b/dlls/ieframe/events.c @@ -109,8 +109,6 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo return CONNECT_E_NOCONNECTION; } -#undef impl_from_IConnectionPointContainer - static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { ConnectionPointContainer_QueryInterface, @@ -130,6 +128,120 @@ static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *ifac return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); } +typedef struct { + IEnumConnections IEnumConnections_iface; + + LONG ref; + + ConnectionPoint *cp; + DWORD iter; +} EnumConnections; + +static inline EnumConnections *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnections, IEnumConnections_iface); +} + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, void **ppv) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else if(IsEqualGUID(&IID_IEnumConnections, riid)) { + TRACE("(%p)->(IID_IEnumConnections %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else { + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *pgcd, ULONG *pcFetched) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG cnt = 0; + + TRACE("(%p)->(%u %p %p)\n", This, cConnections, pgcd, pcFetched); + + while(cConnections--) { + while(This->iter < This->cp->sinks_size && !This->cp->sinks[This->iter]) + This->iter++; + if(This->iter == This->cp->sinks_size) + break; + + pgcd[cnt].pUnk = (IUnknown*)This->cp->sinks[This->iter]; + pgcd[cnt].dwCookie = cnt+1; + This->iter++; + cnt++; + } + + if(pcFetched) + *pcFetched = cnt; + return cnt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%u)\n", This, cConnections); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv) { @@ -245,8 +357,23 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + EnumConnections *ret; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumConnections_iface.lpVtbl = &EnumConnectionsVtbl; + ret->ref = 1; + ret->iter = 0; + + IConnectionPoint_AddRef(&This->IConnectionPoint_iface); + ret->cp = This; + + *ppEnum = &ret->IEnumConnections_iface; + return S_OK; } static const IConnectionPointVtbl ConnectionPointVtbl =

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::close tests.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 9f62d217c36763d791efb4d78d2304fdccd18106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f62d217c36763d791efb4d78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:41:04 2013 +0200 mshtml: Added IHTMLWindow2::close tests. --- dlls/mshtml/tests/htmldoc.c | 274 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 274 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1669943..ae8af82 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -43,6 +43,7 @@ #include "shobjidl.h" #include "htiface.h" #include "tlogstg.h" +#include "exdispid.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -194,6 +195,10 @@ DEFINE_EXPECT(ActiveElementChanged); DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(get_LocationURL); DEFINE_EXPECT(CountEntries); +DEFINE_EXPECT(FindConnectionPoint); +DEFINE_EXPECT(EnumConnections); +DEFINE_EXPECT(EnumConnections_Next); +DEFINE_EXPECT(WindowClosing); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -3940,6 +3945,244 @@ static HRESULT browserservice_qi(REFIID riid, void **ppv) return E_NOINTERFACE; } +static HRESULT WINAPI WBE2Sink_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI WBE2Sink_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); + ok(pdp != NULL, "pDispParams == NULL\n"); + ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo); + ok(puArgErr == NULL, "puArgErr != NULL\n"); + ok(pVarResult == NULL, "pVarResult != NULL\n"); + ok(wFlags == DISPATCH_METHOD, "wFlags=%08x, expected DISPATCH_METHOD\n", wFlags); + ok(!pdp->cNamedArgs, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs = %p\n", pdp->rgdispidNamedArgs); + + switch(dispIdMember) { + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pdp->rgvarg+1, *cancel = pdp->rgvarg; + + CHECK_EXPECT(WindowClosing); + + ok(pdp->cArgs == 2, "pdp->cArgs = %d\n", pdp->cArgs); + ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child)); + ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child)); + ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel)); + ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel)); + + *V_BOOLREF(cancel) = VARIANT_TRUE; + return S_OK; + } + default: + ok(0, "unexpected id %d\n", dispIdMember); + } + + return E_NOTIMPL; +} + +static const IDispatchVtbl WBE2SinkVtbl = { + WBE2Sink_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + WBE2Sink_Invoke +}; + +static IDispatch WBE2Sink = { &WBE2SinkVtbl }; + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + return 2; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + return 1; +} + +static BOOL next_called; + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched) +{ + CHECK_EXPECT2(EnumConnections_Next); + + ok(cConnections == 1, "cConnections = %d\n", cConnections); + ok(pcFetched != NULL, "pcFetched == NULL\n"); + + if(next_called) { + *pcFetched = 0; + return S_FALSE; + } + + next_called = TRUE; + rgcd->pUnk = (IUnknown*)&WBE2Sink; + rgcd->dwCookie = 0xdeadbeef; + *pcFetched = 1; + return S_OK; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG ulConnections) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + +static IEnumConnections EnumConnections = { &EnumConnectionsVtbl }; + +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) +{ + CHECK_EXPECT(EnumConnections); + + *ppEnum = &EnumConnections; + next_called = FALSE; + return S_OK; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static IConnectionPoint ConnectionPointWBE2 = { &ConnectionPointVtbl }; + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + CHECK_EXPECT(FindConnectionPoint); + + if(IsEqualGUID(riid, &DIID_DWebBrowserEvents2)) { + *ppCP = &ConnectionPointWBE2; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + +static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; + static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -3953,6 +4196,11 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid if(IsEqualGUID(riid, &IID_IOleObject)) return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) { + *ppv = &ConnectionPointContainer; + return S_OK; + } + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -5580,6 +5828,30 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) IHTMLWindow2_Release(window); } +static void test_window_close(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + SET_EXPECT(FindConnectionPoint); + SET_EXPECT(EnumConnections); + SET_EXPECT(EnumConnections_Next); + SET_EXPECT(WindowClosing); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(FindConnectionPoint); + CHECK_CALLED(EnumConnections); + CHECK_CALLED(EnumConnections_Next); + CHECK_CALLED(WindowClosing); + + IHTMLWindow2_Release(window); +} + static void test_elem_from_point(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -7014,6 +7286,8 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_open_window(doc, TRUE); if(!support_wbapp) /* FIXME */ test_open_window(doc, FALSE); + if(support_wbapp) + test_window_close(doc); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0