wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Henri Verbeet : d3drm: Avoid LPDIRECT3DRM.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 5e3b4c8751d719f899842ceb3eb9ea1b4923eace URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3b4c8751d719f899842ceb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:45 2013 +0200 d3drm: Avoid LPDIRECT3DRM. --- dlls/d3drm/tests/d3drm.c | 105 +++++++++++++++++++++++----------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 3 files changed, 54 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e3b4c8751d719f899842…

1 0

Henri Verbeet : wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB ().
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 1a551fe5f91c3ed0c56418a25228244e43eee510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a551fe5f91c3ed0c56418a25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:44 2013 +0200 wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 057763f..3493ff2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -651,7 +651,6 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); - checkGLcall("glUniform1ivARB"); } /* Load immediate constants */ @@ -666,13 +665,11 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, idx); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); - checkGLcall("glUniform1ivARB"); - } + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); ptr = list_next(&shader->constantsB, ptr); } + + checkGLcall("shader_glsl_load_constantsB()"); } static void reset_program_constant_version(struct wine_rb_entry *entry, void *context)

1 0

Henri Verbeet : wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB ().
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 302ad29742b11d911d8a337122d220f92b3f4bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302ad29742b11d911d8a33712… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:43 2013 +0200 wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c84d73b..057763f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -650,12 +650,8 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con * locations of the constants to avoid looking up each time */ snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) - { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); - checkGLcall("glUniform1ivARB"); - } + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); + checkGLcall("glUniform1ivARB"); } /* Load immediate constants */

1 0

Henri Verbeet : wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 00cc81dc69c0f61107d5d2b9f27b946221794020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cc81dc69c0f61107d5d2b9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:42 2013 +0200 wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit. --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc5b4d2..9110bbd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -986,22 +986,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - if (!(flags & WINED3D_MAP_READONLY)) + if (flags & WINED3D_MAP_DISCARD) { - if (flags & WINED3D_MAP_DISCARD) - { - /* DISCARD invalidates the entire buffer, regardless of the - * specified offset and size. Some applications also depend on the - * entire buffer being uploaded in that case. Two such - * applications are Port Royale and Darkstar One. */ - if (!buffer_add_dirty_area(buffer, 0, 0)) - return E_OUTOFMEMORY; - } - else - { - if (!buffer_add_dirty_area(buffer, offset, size)) - return E_OUTOFMEMORY; - } + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (!buffer_add_dirty_area(buffer, 0, 0)) + return E_OUTOFMEMORY; + } + else if (!(flags & WINED3D_MAP_READONLY)) + { + if (!buffer_add_dirty_area(buffer, offset, size)) + return E_OUTOFMEMORY; } count = ++buffer->resource.map_count;

1 0

Jacek Caban : ieframe: Added DISPID_WINDOWCLOSING tests.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: e5147a51614cd9671aff4a9700f35a0ede73a2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5147a51614cd9671aff4a970… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 16 12:01:17 2013 +0200 ieframe: Added DISPID_WINDOWCLOSING tests. --- dlls/ieframe/tests/webbrowser.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 47d0fbc..1eb6119 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -109,6 +109,7 @@ DEFINE_EXPECT(Invoke_TITLECHANGE); DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); +DEFINE_EXPECT(Invoke_WINDOWCLOSING); DEFINE_EXPECT(Invoke_282); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); @@ -658,7 +659,7 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID { *ppv = NULL; - if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { + if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid) || IsEqualGUID(&IID_IDispatch, riid)) { *ppv = iface; return S_OK; } @@ -951,6 +952,21 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_documentcomplete(pDispParams); break; + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pDispParams->rgvarg+1, *cancel = pDispParams->rgvarg; + + CHECK_EXPECT(Invoke_WINDOWCLOSING); + + ok(pDispParams->cArgs == 2, "pdp->cArgs = %d\n", pDispParams->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; + } + case 282: /* FIXME */ CHECK_EXPECT2(Invoke_282); break; @@ -3085,6 +3101,28 @@ static void test_external(IWebBrowser2 *unk) IDocHostUIHandler2_Release(dochost); } +static void test_htmlwindow_close(IWebBrowser2 *wb) +{ + IHTMLWindow2 *window; + IHTMLDocument2 *doc; + HRESULT hres; + + doc = get_document(wb); + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + IHTMLDocument2_Release(doc); + + SET_EXPECT(Invoke_WINDOWCLOSING); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(Invoke_WINDOWCLOSING); + + IHTMLWindow2_Release(window); +} + static void test_TranslateAccelerator(IWebBrowser2 *unk) { IOleClientSite *doc_clientsite; @@ -3404,6 +3442,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) } test_external(webbrowser); + test_htmlwindow_close(webbrowser); if(do_close) test_Close(webbrowser, do_download);

1 0

Ken Thomases : winemac: Refactor WineApplication class to separate most logic into a controller class .
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: e7d5f329e5c0df157485b697ebd246e46200d490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5f329e5c0df157485b697e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:38:01 2013 -0500 winemac: Refactor WineApplication class to separate most logic into a controller class. --- dlls/winemac.drv/cocoa_app.h | 18 +++- dlls/winemac.drv/cocoa_app.m | 214 ++++++++++++++++++++++++--------------- dlls/winemac.drv/cocoa_event.m | 8 +- dlls/winemac.drv/cocoa_main.m | 28 ++++- dlls/winemac.drv/cocoa_window.m | 80 ++++++++------- 5 files changed, 218 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7d5f329e5c0df157485b…

1 0

Ken Thomases : libwine: Add libwine's directory (@loader_path) to rpath.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 304463b4e14472d6ff7e7cccc59b96356a98d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304463b4e14472d6ff7e7cccc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:37:54 2013 -0500 libwine: Add libwine's directory (@loader_path) to rpath. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8c713a..3468ee0 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -131,7 +131,7 @@ libwine.dll: $(OBJS) wine.def Makefile.in DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) -install_name @rpath/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name @rpath/$(DYNAME) -Wl,-rpath,@loader_path/ $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@

1 0

Ken Thomases : loader: On Mac, if Wine is already on secondary thread, don' t reserve it for the system frameworks.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: cf73350d9ff3e689b1966548b49841252ca7d488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf73350d9ff3e689b1966548b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:37:48 2013 -0500 loader: On Mac, if Wine is already on secondary thread, don't reserve it for the system frameworks. --- libs/wine/loader.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 302e9c1..7af1233 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -761,6 +761,12 @@ static void apple_main_thread( void (*init_func)(void) ) CFRunLoopSourceContext source_context = { 0 }; CFRunLoopSourceRef source; + if (!pthread_main_np()) + { + init_func(); + return; + } + /* Multi-processing Services can get confused about the main thread if the * first time it's used is on a secondary thread. Use it here to make sure * that doesn't happen. */

1 0

Jacek Caban : ieframe: Return document as IHTMLDocument2 iface from get_document.
by Alexandre Julliard 15 Apr '13

15 Apr '13

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

Jacek Caban : ieframe: Added IConnectionPoint:: EnumConnections implementation.
by Alexandre Julliard 15 Apr '13

15 Apr '13

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

← Newer
1
...
23
24
25
26
27
28
29
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013