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

Stefan Dösinger : wined3d: Store ps 1. 4 texture types in ps_compile_args.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0680b1758df48222f6770d9c3de0def95ff97ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0680b1758df48222f6770d9c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:16 2013 +0200 wined3d: Store ps 1.4 texture types in ps_compile_args. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/shader.c | 61 ++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 17 ++++++++-- 4 files changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c3313ec..6683829 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4354,7 +4354,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - pixelshader_update_samplers(&shader->reg_maps, device->stateBlock->state.textures); + pixelshader_update_samplers(shader, args->super.tex_types); if (!shader_buffer_init(&buffer)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab32abe..c84d73b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4627,7 +4627,6 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { - struct wined3d_state *state = &shader->device->stateBlock->state; struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -4690,7 +4689,7 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, memset(np2fixup, 0, sizeof(*np2fixup)); *np2fixup_info = args->np2_fixup ? np2fixup : NULL; - pixelshader_update_samplers(&shader->reg_maps, state->textures); + pixelshader_update_samplers(shader, args->tex_types); shader_buffer_clear(buffer); ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 692e5b2..0431c1f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2062,6 +2062,39 @@ void find_ps_compile_args(const struct wined3d_state *state, } } } + if (shader->reg_maps.shader_version.major == 1 + && shader->reg_maps.shader_version.minor <= 4) + { + for (i = 0; i < shader->limits.sampler; ++i) + { + const struct wined3d_texture *texture = state->textures[i]; + + if (!shader->reg_maps.sampler_type[i]) + continue; + + /* Treat unbound textures as 2D. The dummy texture will provide + * the proper sample value. The tex_types bitmap defaults to + * 2D because of the memset. */ + if (!texture) + continue; + + switch (texture->target) + { + /* RECT textures are distinguished from 2D textures via np2_fixup */ + case GL_TEXTURE_RECTANGLE_ARB: + case GL_TEXTURE_2D: + break; + + case GL_TEXTURE_3D: + args->tex_types |= WINED3D_SHADER_TEX_3D << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + + case GL_TEXTURE_CUBE_MAP_ARB: + args->tex_types |= WINED3D_SHADER_TEX_CUBE << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + } + } + } for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -2274,46 +2307,32 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de return WINED3D_OK; } -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, struct wined3d_texture * const *textures) +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) { + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; enum wined3d_sampler_texture_type *sampler_type = reg_maps->sampler_type; unsigned int i; if (reg_maps->shader_version.major != 1) return; - for (i = 0; i < max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS); ++i) + for (i = 0; i < shader->limits.sampler; ++i) { /* We don't sample from this sampler. */ if (!sampler_type[i]) continue; - if (!textures[i]) + switch ((tex_types >> i * WINED3D_PSARGS_TEXTYPE_SHIFT) & WINED3D_PSARGS_TEXTYPE_MASK) { - WARN("No texture bound to sampler %u, using 2D.\n", i); - sampler_type[i] = WINED3DSTT_2D; - continue; - } - - switch (textures[i]->target) - { - case GL_TEXTURE_RECTANGLE_ARB: - case GL_TEXTURE_2D: - /* We have to select between texture rectangles and 2D - * textures later because 2.0 and 3.0 shaders only have - * WINED3DSTT_2D as well. */ + case WINED3D_SHADER_TEX_2D: sampler_type[i] = WINED3DSTT_2D; break; - case GL_TEXTURE_3D: + case WINED3D_SHADER_TEX_3D: sampler_type[i] = WINED3DSTT_VOLUME; break; - case GL_TEXTURE_CUBE_MAP_ARB: + case WINED3D_SHADER_TEX_CUBE: sampler_type[i] = WINED3DSTT_CUBE; break; - - default: - FIXME("Unrecognized texture type %#x, using 2D.\n", textures[i]->target); - sampler_type[i] = WINED3DSTT_2D; } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ca2b10..2137585 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -746,13 +746,25 @@ enum fogmode { #define WINED3D_PSARGS_PROJECTED (1 << 3) #define WINED3D_PSARGS_TEXTRANSFORM_SHIFT 4 #define WINED3D_PSARGS_TEXTRANSFORM_MASK 0xf +#define WINED3D_PSARGS_TEXTYPE_SHIFT 2 +#define WINED3D_PSARGS_TEXTYPE_MASK 0x3 + +/* Similar to tex_types, except that it doesn't have 1d textures + * (can't be bound), rect textures (handled via np2_fixup) and + * none / unknown (treated as 2d and handled via dummy textures). */ +enum wined3d_shader_tex_types +{ + WINED3D_SHADER_TEX_2D = 0, + WINED3D_SHADER_TEX_3D = 1, + WINED3D_SHADER_TEX_CUBE = 2, +}; struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; enum vertexprocessing_mode vp_mode; enum fogmode fog; WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - /* Texture types(2D, Cube, 3D) in ps 1.x */ + WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; WORD np2_fixup; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). @@ -2635,8 +2647,7 @@ struct wined3d_shader } u; }; -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, - struct wined3d_texture * const *textures) DECLSPEC_HIDDEN; +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN;

1 0

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

15 Apr '13

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

Jacek Caban : mshtml: Store IWebBrowserApp reference in HTMLDocumentObj.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 8f323e9b91656f73111f549fed83d83f715d1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f323e9b91656f73111f549fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:43 2013 +0200 mshtml: Store IWebBrowserApp reference in HTMLDocumentObj. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/oleobj.c | 13 +++++++------ dlls/mshtml/persist.c | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d0bb68e..f141bdf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -544,6 +544,7 @@ struct HTMLDocumentObj { IOleInPlaceUIWindow *ip_window; IAdviseSink *view_sink; IDocObjectService *doc_object_service; + IUnknown *webbrowser; DOCHOSTUIINFO hostinfo; @@ -557,7 +558,6 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; - BOOL is_webbrowser; BOOL container_locked; BOOL focus; BOOL has_popup; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index b585b68..3bae9f7 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -268,7 +268,7 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_container, 1005); call_explorer_69(doc); - if(doc->is_webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) + if(doc->webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d99d0aa..5661308 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2268,7 +2268,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { if(!(flags & BINDING_REFRESH)) { BOOL cancel = FALSE; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index d62c306..c463ebe 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -246,8 +246,12 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->doc_object_service = NULL; } + if(This->doc_obj->webbrowser) { + IUnknown_Release(This->doc_obj->webbrowser); + This->doc_obj->webbrowser = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); - This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -348,11 +352,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite * embedder supports IWebBrowserApp. */ hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); - if(SUCCEEDED(hres)) { - This->doc_obj->is_webbrowser = TRUE; - IWebBrowser2_Release(wb); - } - + if(SUCCEEDED(hres)) + This->doc_obj->webbrowser = (IUnknown*)wb; IBrowserService_Release(browser_service); } } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b2eefd3..0038942 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -77,7 +77,7 @@ static void notify_travellog_update(HTMLDocumentObj *doc) IOleCommandTarget *cmdtrg; HRESULT hres; - if(!doc->is_webbrowser) + if(!doc->webbrowser) return; hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::close partial implementation.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e13cf82e61abcc2d904bfe13ec06bc2993c3e814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13cf82e61abcc2d904bfe13e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:53 2013 +0200 mshtml: Added IHTMLWindow2::close partial implementation. --- dlls/mshtml/htmlwindow.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6cfa76b..113f33a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -28,6 +28,7 @@ #include "mshtmdid.h" #include "shlguid.h" #include "shobjidl.h" +#include "exdispid.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -772,10 +773,79 @@ static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory ** return S_OK; } +static BOOL notify_webbrowser_close(HTMLOuterWindow *window, HTMLDocumentObj *doc) +{ + IConnectionPointContainer *cp_container; + VARIANT_BOOL cancel = VARIANT_FALSE; + IEnumConnections *enum_conn; + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, 2, 0}; + CONNECTDATA conn_data; + IConnectionPoint *cp; + IDispatch *disp; + ULONG fetched; + HRESULT hres; + + if(!doc->webbrowser) + return TRUE; + + hres = IUnknown_QueryInterface(doc->webbrowser, &IID_IConnectionPointContainer, (void**)&cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, &DIID_DWebBrowserEvents2, &cp); + IConnectionPointContainer_Release(cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPoint_EnumConnections(cp, &enum_conn); + IConnectionPoint_Release(cp); + if(FAILED(hres)) + return TRUE; + + while(!cancel) { + conn_data.pUnk = NULL; + conn_data.dwCookie = 0; + fetched = 0; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + if(hres != S_OK) + break; + + hres = IUnknown_QueryInterface(conn_data.pUnk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(conn_data.pUnk); + if(FAILED(hres)) + continue; + + V_VT(args) = VT_BYREF|VT_BOOL; + V_BOOLREF(args) = &cancel; + V_VT(args+1) = VT_BOOL; + V_BOOL(args+1) = window->parent ? VARIANT_TRUE : VARIANT_FALSE; + hres = IDispatch_Invoke(disp, DISPID_WINDOWCLOSING, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + IDispatch_Release(disp); + if(FAILED(hres)) + cancel = VARIANT_FALSE; + } + + IEnumConnections_Release(enum_conn); + return !cancel; +} + static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); + HTMLOuterWindow *window = This->outer_window; + + TRACE("(%p)\n", This); + + if(!window->doc_obj) { + FIXME("No document object\n"); + return E_FAIL; + } + + if(!notify_webbrowser_close(window, window->doc_obj)) + return S_OK; + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::close tests.
by Alexandre Julliard 15 Apr '13

15 Apr '13

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

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

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

André Hentschel : setupapi: Add stubs for CM_Reenumerate_DevNode and CM_Reenumerate_DevNode_Ex.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f79fa294c9f7c15286e575c6a38aa2827ff06d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79fa294c9f7c15286e575c6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 15:36:06 2013 +0200 setupapi: Add stubs for CM_Reenumerate_DevNode and CM_Reenumerate_DevNode_Ex. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index a2ade67..cac0a13 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -141,8 +141,8 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex -@ stub CM_Reenumerate_DevNode -@ stub CM_Reenumerate_DevNode_Ex +@ stdcall CM_Reenumerate_DevNode(ptr long) setupapi.CM_Reenumerate_DevNode +@ stdcall CM_Reenumerate_DevNode_Ex(ptr long ptr) setupapi.CM_Reenumerate_DevNode_Ex @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex @ stub CM_Register_Device_InterfaceA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9a13bb2..b412e75 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -156,8 +156,8 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex -@ stub CM_Reenumerate_DevNode -@ stub CM_Reenumerate_DevNode_Ex +@ stdcall CM_Reenumerate_DevNode(ptr long) +@ stdcall CM_Reenumerate_DevNode_Ex(ptr long ptr) @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex @ stub CM_Register_Device_InterfaceA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 030b295..3855b46 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -435,6 +435,18 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON return CR_FAILURE; } +CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags) +{ + FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags); + return CR_FAILURE; +} + +CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMACHINE machine) +{ + FIXME("0x%08x 0x%08x %p: stub\n", dnDevInst, ulFlags, machine); + return CR_FAILURE; +} + /*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */

1 0

André Hentschel : setupapi: Add stub keyword to some FIXMEs.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f8c77fbd628a62221f985755baf7de675d4f31f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c77fbd628a62221f985755b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 15:36:17 2013 +0200 setupapi: Add stub keyword to some FIXMEs. --- dlls/setupapi/stubs.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3855b46..76dc410 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -46,7 +46,7 @@ CONFIGRET WINAPI CM_Connect_MachineA(PCSTR name, PHMACHINE machine) */ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine) { - FIXME("\n"); + FIXME("stub\n"); return CR_ACCESS_DENIED; } @@ -73,7 +73,7 @@ CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, */ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) { - FIXME("\n"); + FIXME("stub\n"); return CR_SUCCESS; } @@ -84,7 +84,7 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) DWORD WINAPI CM_Get_Device_ID_ExA( DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -94,7 +94,7 @@ DWORD WINAPI CM_Get_Device_ID_ExA( DWORD WINAPI CM_Get_Device_ID_ExW( DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -104,7 +104,7 @@ DWORD WINAPI CM_Get_Device_ID_ExW( CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %d 0x%08x: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -116,7 +116,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %d 0x%08x: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -127,7 +127,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListW( */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x\n", pulLen, debugstr_a(pszFilter), ulFlags); + FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_a(pszFilter), ulFlags); return CR_SUCCESS; } @@ -137,7 +137,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x\n", pulLen, debugstr_w(pszFilter), ulFlags); + FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_w(pszFilter), ulFlags); return CR_SUCCESS; } @@ -219,7 +219,7 @@ BOOL WINAPI SetupOpenLog(BOOL Reserved) */ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) { - FIXME("%p, %p, %d\n", file_queue, owner, scan_only); + FIXME("%p, %p, %d: stub\n", file_queue, owner, scan_only); return 0; } @@ -228,7 +228,7 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -237,7 +237,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buf */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -246,7 +246,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu */ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) { - FIXME("0x%08x %s\n", flags, debugstr_a(source)); + FIXME("0x%08x %s: stub\n", flags, debugstr_a(source)); return TRUE; } @@ -255,7 +255,7 @@ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) */ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) { - FIXME("0x%08x %s\n", flags, debugstr_w(source)); + FIXME("0x%08x %s: stub\n", flags, debugstr_w(source)); return TRUE; } @@ -264,7 +264,7 @@ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) { - FIXME("0x%08x %p %d\n", flags, list, count); + FIXME("0x%08x %p %d: stub\n", flags, list, count); return FALSE; } @@ -273,7 +273,7 @@ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) */ BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) { - FIXME("0x%08x %p %d\n", flags, list, count); + FIXME("0x%08x %p %d: stub\n", flags, list, count); return FALSE; } @@ -310,7 +310,7 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), + FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), hwndParent, OpenFlags, DeviceInfoData); return FALSE; } @@ -321,7 +321,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), + FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), hwndParent, OpenFlags, DeviceInfoData); return FALSE; }

1 0

Michael Stefaniuc : dplayx: IDirectPlayLobby3 / IDirectPlayLobby3A have independent refcounts.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 02e9c9997613f81c4f956bf1867e96068bd4f41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e9c9997613f81c4f956bf18… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Apr 13 21:41:32 2013 +0200 dplayx: IDirectPlayLobby3 / IDirectPlayLobby3A have independent refcounts. --- dlls/dplayx/dplobby.c | 81 +++++++++++++++++++++++--------------------- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 12444cc..a0c11dd 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -83,7 +83,8 @@ typedef struct IDirectPlayLobbyImpl { IDirectPlayLobby3 IDirectPlayLobby3_iface; IDirectPlayLobby3A IDirectPlayLobby3A_iface; - LONG ulInterfaceRef; + LONG numIfaces; /* "in use interfaces" refcount */ + LONG ref3, ref3A; CRITICAL_SECTION lock; DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; @@ -152,40 +153,12 @@ static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID rii return S_OK; } -/* - * Simple procedure. Just increment the reference count to this - * structure and return the new reference count. - */ -static ULONG WINAPI DPL_AddRef( IDirectPlayLobbyImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - - TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - - return ulInterfaceRefCount; -} - -/* - * Simple COM procedure. Decrease the reference count to this object. - * If the object no longer has any reference counts, free up the associated - * memory. - */ -static ULONG WINAPI DPL_Release( IDirectPlayLobbyImpl *This ) +static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { - ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - - TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulInterfaceRefCount == 0 ) - { - DPL_DestroyLobby1( This ); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->lock ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ulInterfaceRefCount; + DPL_DestroyLobby1( obj ); + obj->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &obj->lock ); + HeapFree( GetProcessHeap(), 0, obj ); } static HRESULT WINAPI IDirectPlayLobby3AImpl_QueryInterface( IDirectPlayLobby3A *iface, REFIID riid, @@ -205,25 +178,53 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_QueryInterface( IDirectPlayLobby3 *i static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref3A ); + + TRACE( "(%p) ref3A=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3Impl_AddRef(IDirectPlayLobby3 *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref3 ); + + TRACE( "(%p) ref3=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3AImpl_Release(IDirectPlayLobby3A *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref3A ); + + TRACE( "(%p) ref3A=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplobby_destroy( This ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref3 ); + + TRACE( "(%p) ref3=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplobby_destroy( This ); + + return ref; } @@ -1520,7 +1521,9 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; - obj->ulInterfaceRef = 1; + obj->numIfaces = 1; + obj->ref3 = 1; + obj->ref3A = 0; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6ed864c..991b3c6 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6487,7 +6487,7 @@ static void test_COM_dplobby(void) hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobbyA, (void**)&dplA); ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobbyA failed: %08x\n", hr); refcount = IDirectPlayLobby_AddRef(dplA); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlayLobby_Release(dplA); hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby2, (void**)&dpl2);

1 0