wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH v2 1/7] server: Allow passing suspend context in select request.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/server.c | 1 + server/protocol.def | 5 ++++- server/thread.c | 20 ++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[PATCH 6/7] ntdll: Use server_select to pass context to server in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 8 +------- server/debugger.c | 26 +------------------------- server/protocol.def | 3 --- server/thread.c | 6 ------ server/thread.h | 1 - 5 files changed, 2 insertions(+), 42 deletions(-)

2 2

[PATCH 5/5] adsldp: Add support for paged search.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 56 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c2f7ca8023..7b2306da21 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -409,6 +409,7 @@ typedef struct struct ldap_search_context { + PLDAPSearch page; LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; @@ -1329,12 +1330,26 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte ctrls = ctrls_a; } - err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + if (ldap->search.pagesize) + { + ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, + filter, props, ldap->search.attribtypes_only, + ctrls, NULL, 0, 0, NULL); + if (ldap_ctx->page) + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, + ldap->search.pagesize, &count, &ldap_ctx->res); + else + err = LDAP_NO_MEMORY; + } + else + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { TRACE("ldap_search_sW error %#x\n", err); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); heap_free(ldap_ctx); return HRESULT_FROM_WIN32(map_ldap_error(err)); } @@ -1384,11 +1399,42 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND else { if (ldap_ctx->pos >= ldap_ctx->count) + { + if (ldap_ctx->page) + { + ULONG err, count; + + ldap_msgfree(ldap_ctx->res); + ldap_ctx->res = NULL; + + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); + if (err == LDAP_SUCCESS) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + goto exit; + } + + if (err != LDAP_NO_RESULTS_RETURNED) + { + TRACE("ldap_get_next_page_s error %#x\n", err); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + /* fall through */ + } + return S_ADS_NOMORE_ROWS; + } ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } +exit: if (!ldap_ctx->entry) return S_ADS_NOMORE_ROWS; @@ -1782,13 +1828,17 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); struct ldap_search_context *ldap_ctx = res; TRACE("%p,%p\n", iface, res); if (!res) return E_ADS_BAD_PARAMETER; - ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); + if (ldap_ctx->res) + ldap_msgfree(ldap_ctx->res); return S_OK; } -- 2.25.2

1 0

[PATCH 4/5] wldap32: Implement ldap_get_next_page_s.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f1244dca0d..7424eb6251 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -173,10 +173,37 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, struct l_timeval *timeout, ULONG pagesize, ULONG *count, WLDAP32_LDAPMessage **results ) { - FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, +#ifdef HAVE_LDAP + ULONG ret; + + TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + if (!ld || !search || !count || !results) return ~0u; - if (!ld) return ~0u; + if (search->cookie && search->cookie->bv_len == 0) + { + /* end of paged results */ + return WLDAP32_LDAP_NO_RESULTS_RETURNED; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_control( ld->ld, pagesize, search->cookie, 1, &search->serverctrls[0] ); + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + if (ret != LDAP_SUCCESS) return map_error( ret ); + + ret = ldap_search_ext_s( ld->ld, search->base, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; } -- 2.25.2

1 0

[PATCH 3/5] wldap32: Implement ldap_get_paged_count.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 79fdd7af16..f1244dca0d 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +static struct berval null_cookie = { 0, NULL }; + /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) * @@ -77,7 +79,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, LDAPControlW *ctrl; BerElement *ber; ber_tag_t tag; - struct berval *berval, null_cookie = { 0, NULL }; + struct berval *berval; INT ret, len; char *val; @@ -181,15 +183,43 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG *count, WLDAP32_LDAPMessage *results ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results ); + ULONG ret; + LDAPControl **server_ctrls, *page_ctrl = NULL; + struct berval cookie; + + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); + + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + server_ctrls = NULL; + ret = ldap_parse_result( ld->ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (server_ctrls) + page_ctrl = ldap_control_find( LDAP_CONTROL_PAGEDRESULTS, server_ctrls, NULL ); + + if (!page_ctrl) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + ret = ldap_parse_pageresponse_control( ld->ld, page_ctrl, (int *)count, &cookie ); + if (ret == LDAP_SUCCESS) + { + TRACE("new search->cookie: %s, count %u\n", debugstr_an(cookie.bv_val, cookie.bv_len), *count); + search->cookie = ber_bvdup( &cookie ); + } + + ldap_controls_free( server_ctrls ); + + return map_error( ret ); #endif - return ret; + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -271,7 +301,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) strarrayfreeU( search->attrs ); controlarrayfreeU( search->serverctrls ); controlarrayfreeU( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search ); -- 2.25.2

1 0

[PATCH 2/5] wldap32: Implement ldap_search_abandon_page.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 27a8156e51..79fdd7af16 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,9 +262,19 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) { - FIXME( "(%p, %p)\n", ld, search ); + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeU( search->base ); + strfreeU( search->filter ); + strarrayfreeU( search->attrs ); + controlarrayfreeU( search->serverctrls ); + controlarrayfreeU( search->clientctrls ); + if (search->cookie) + ber_bvfree( search->cookie ); + heap_free( search ); - if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; } -- 2.25.2

1 0

[PATCH 1/4] wined3d: Remove WINED3D_RS_EDGEANTIALIAS.
by Chip Davis 15 Apr '20

15 Apr '20

Handle this render state similarly to D3DRS_ZFUNC, by mapping it in the client DLLs. As far as I can tell, save for the fact that it's only supposed to apply to lines forming a convex outline, it's roughly equivalent to D3DRS_ANTIALIASEDLINEENABLE. We definitely handled it the same way. Curiously, even though we supported the render state, we didn't set the corresponding capability bit. Do that now. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d8/device.c | 13 +++++++++++-- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/device.c | 10 ++++++++-- dlls/wined3d/state.c | 13 +++++-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 -- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a67f817785..07f6dccbcbf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -422,6 +422,9 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + if (caps->LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->RasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; + caps->LineCaps &= ~WINED3DLINECAPS_ANTIALIAS; caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER @@ -446,9 +449,15 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) { - if (state == D3DRS_ZBIAS) + switch (state) + { + case D3DRS_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRS_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba9011..4ebf51d040c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1340,6 +1340,8 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) if (caps->dpcLineCaps.dwRasterCaps & WINED3DPRASTERCAPS_DEPTHBIAS) caps->dpcLineCaps.dwRasterCaps = (caps->dpcLineCaps.dwRasterCaps | D3DPRASTERCAPS_ZBIAS) & ~WINED3DPRASTERCAPS_DEPTHBIAS; + if (wined3d_caps.LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->dpcLineCaps.dwRasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; caps->dpcLineCaps.dwZCmpCaps &= ( D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e09100dfdc7..47856a05fb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -74,9 +74,15 @@ static inline WORD d3d_fpu_setup(void) static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) { - if (state == D3DRENDERSTATE_ZBIAS) + switch (state) + { + case D3DRENDERSTATE_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRENDERSTATE_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d375122781b..1cb9f222eab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,12 +1798,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta } } -static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void line_antialias(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_rasterizer_state *r = state->rasterizer_state; - - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) + if (r && r->desc.line_antialias) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4427,7 +4424,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4445,7 +4442,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4602,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, @@ -5504,6 +5500,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 8, 8}, { 17, 22}, { 27, 27}, + { 40, 40}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48d133485b8..7e97c84c19e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1665,7 +1665,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_FOGEND] = tmpfloat.d; tmpfloat.f = 1.0f; rs[WINED3D_RS_FOGDENSITY] = tmpfloat.d; - rs[WINED3D_RS_EDGEANTIALIAS] = FALSE; rs[WINED3D_RS_RANGEFOGENABLE] = FALSE; rs[WINED3D_RS_STENCILENABLE] = FALSE; rs[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 335d502ab0b..004c33f8ea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4919,7 +4919,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_FOGEND); D3DSTATE_TO_STR(WINED3D_RS_FOGDENSITY); D3DSTATE_TO_STR(WINED3D_RS_STIPPLEENABLE); - D3DSTATE_TO_STR(WINED3D_RS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3D_RS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3D_RS_MIPMAPLODBIAS); D3DSTATE_TO_STR(WINED3D_RS_RANGEFOGENABLE); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3b41896e4..d3eb8100cd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -310,7 +310,6 @@ enum wined3d_render_state WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, WINED3D_RS_STIPPLEENABLE = 39, - WINED3D_RS_EDGEANTIALIAS = 40, WINED3D_RS_COLORKEYENABLE = 41, WINED3D_RS_MIPMAPLODBIAS = 46, WINED3D_RS_RANGEFOGENABLE = 48, @@ -1209,7 +1208,6 @@ enum wined3d_shader_type #define WINED3DPRASTERCAPS_STIPPLE 0x00000200 #define WINED3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 #define WINED3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 -#define WINED3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 #define WINED3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 #define WINED3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 #define WINED3DPRASTERCAPS_FOGRANGE 0x00010000 -- 2.24.0

2 4

[PATCH 7/7] server: Get rid of separated thread suspend_context.
by Jacek Caban 15 Apr '20

15 Apr '20

It's always the same as context now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 31 +++++++++++++------------------ server/thread.h | 3 +-- 2 files changed, 14 insertions(+), 20 deletions(-)

2 1

[PATCH v2 1/5] devenum/tests: Avoid running test_devenum() twice.
by Zebediah Figura 15 Apr '20

15 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Mostly since running with -v is a handy way to enumerate all devices. dlls/devenum/tests/devenum.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 6164efb7774..06efa3d773c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static void test_devenum(IBindCtx *bind_ctx) +static void test_devenum(void) { IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; @@ -45,6 +45,7 @@ static void test_devenum(IBindCtx *bind_ctx) IMoniker *moniker; GUID cat_guid, clsid; WCHAR *displayname; + IBindCtx *bindctx; VARIANT var; HRESULT hr; int count; @@ -58,7 +59,7 @@ static void test_devenum(IBindCtx *bind_ctx) while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); @@ -100,7 +101,7 @@ static void test_devenum(IBindCtx *bind_ctx) "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -110,9 +111,16 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); - hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + IPropertyBag_Release(prop_bag); + IBindCtx_Release(bindctx); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); @@ -1087,21 +1095,11 @@ static void test_vfw(void) START_TEST(devenum) { - IBindCtx *bind_ctx = NULL; HRESULT hr; CoInitialize(NULL); - test_devenum(NULL); - - /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ - hr = CreateBindCtx(0, &bind_ctx); - ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); - if (bind_ctx) { - test_devenum(bind_ctx); - IBindCtx_Release(bind_ctx); - } - + test_devenum(); test_moniker_isequal(); test_register_filter(); test_directshow_filter(); -- 2.26.0

1 4

[PATCH 1/5] devenum/tests: Avoid running test_devenum() twice.
by Zebediah Figura 15 Apr '20

15 Apr '20

1 4

← Newer
1
...
47
48
49
50
51
52
53
...
86
Older →

Jump to page:

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-devel April 2020