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

Dmitry Timoshkov : wldap32: Fix server controls lookup logic.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 6df25aafbb2999de30f17308cd516c509abeb05b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6df25aafbb2999de30f17308… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:39 2020 +0800 wldap32: Fix server controls lookup logic. This fixes 'supported == user_count' comparison if the server has duplicate control OIDs in the returned list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 87eb779953..cf948bf037 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -439,10 +439,15 @@ static BOOL is_supported_server_ctrls( WLDAP32_LDAP *ld, LDAPControl **ctrls ) for (n = 0; n < user_count; n++) { + TRACE("looking for %s\n", debugstr_a(ctrls[n]->ldctl_oid)); + for (i = 0; i < server_count; i++) { if (!strncmp( ctrls[n]->ldctl_oid, ld->ld_server_ctrls[i]->bv_val, ld->ld_server_ctrls[i]->bv_len)) + { supported++; + break; + } } }

1 0

Chip Davis : d3d11: Introduce a function to convert D3D10 map types to wined3d map flags.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 43a4037d33d72d87611457fe7f990b1766a20a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4037d33d72d87611457fe… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:55 2020 -0500 d3d11: Introduce a function to convert D3D10 map types to wined3d map flags. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 6 +++--- dlls/d3d11/utils.c | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index f2b950f357..b33be57d43 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -310,7 +310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)); *data = wined3d_map_desc.data; wined3d_mutex_unlock(); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1e8d86fede..48c76959fa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -69,6 +69,7 @@ DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 36d07beb23..1682aa05d9 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -356,7 +356,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { *data = wined3d_map_desc.data; } @@ -858,7 +858,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -1355,7 +1355,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 065436cb4f..0e483fd4bb 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -756,6 +756,11 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) } } +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +{ + return wined3d_map_flags_from_d3d11_map_type((D3D11_MAP)map_type); +} + DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) { DWORD wined3d_clear_flags = 0;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 cull modes to wined3d.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: b38d055a7cfe8af6dc9f51c6bfca0a78fb3160b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38d055a7cfe8af6dc9f51c6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:05 2020 -0500 d3d11: Introduce a function to convert D3D11 cull modes to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b4bcf63094..a4a3021db9 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1076,6 +1076,11 @@ static enum wined3d_fill_mode wined3d_fill_mode_from_d3d11(D3D11_FILL_MODE mode) return (enum wined3d_fill_mode)mode; } +static enum wined3d_cull wined3d_cull_from_d3d11(D3D11_CULL_MODE mode) +{ + return (enum wined3d_cull)mode; +} + static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -1096,7 +1101,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.fill_mode = wined3d_fill_mode_from_d3d11(desc->FillMode); - wined3d_desc.cull_mode = desc->CullMode; + wined3d_desc.cull_mode = wined3d_cull_from_d3d11(desc->CullMode); wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_bias = desc->DepthBias; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp;

1 0

Chip Davis : d3d11/tests: Use compare_uint() in a few more places.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: bd9e3dde1e860842a7a478915e43a695505cf71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9e3dde1e860842a7a47891… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:00:44 2020 -0500 d3d11/tests: Use compare_uint() in a few more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 37ec829cd7..3ae05537a1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1011,7 +1011,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u8(rb, x, y, z); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -1046,7 +1046,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u16(rb, x, y, z); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -1081,7 +1081,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u32(rb, x, y, z) >> shift; - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -25841,7 +25841,7 @@ static void test_depth_bias(void) u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - all_match = abs(u32_value - expected_value) <= 3; + all_match = compare_uint(u32_value, expected_value, 3); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, @@ -25850,7 +25850,7 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - all_match = abs(*u16 - expected_value) <= 1; + all_match = compare_uint(*u16, expected_value, 1); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f);

1 0

Chip Davis : d3d11: Introduce a function to convert D3D10 DSV dimensions to D3D11.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ace51383aebd053e0c83ae7faef55b8e45bde854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace51383aebd053e0c83ae7f… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:56 2020 -0500 d3d11: Introduce a function to convert D3D10 DSV dimensions to D3D11. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4683ce5f3b..bc411b0b9f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5428,6 +5428,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic return S_OK; } +static D3D11_DSV_DIMENSION d3d11_dsv_dimension_from_d3d10(D3D10_DSV_DIMENSION dim) +{ + return (D3D11_DSV_DIMENSION)dim; +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10DepthStencilView **view) { @@ -5442,7 +5447,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic if (desc) { d3d11_desc.Format = desc->Format; - d3d11_desc.ViewDimension = desc->ViewDimension; + d3d11_desc.ViewDimension = d3d11_dsv_dimension_from_d3d10(desc->ViewDimension); d3d11_desc.Flags = 0; memcpy(&d3d11_desc.u, &desc->u, sizeof(d3d11_desc.u)); }

1 0

Chip Davis : d3d11: Introduce a function to convert a D3D11 input class to wined3d.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: e9250827cbf1889fd919b327c471ed01e8967394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9250827cbf1889fd919b327… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:59 2020 -0500 d3d11: Introduce a function to convert a D3D11 input class to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index e27984212b..6b59dd994b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -38,6 +38,11 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co return NULL; } +static enum wined3d_input_classification wined3d_input_classification_from_d3d11(D3D11_INPUT_CLASSIFICATION slot_class) +{ + return (enum wined3d_input_classification)slot_class; +} + static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct wined3d_vertex_element **wined3d_elements) @@ -69,7 +74,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME e->input_slot = f->InputSlot; e->offset = f->AlignedByteOffset; e->output_slot = WINED3D_OUTPUT_SLOT_UNUSED; - e->input_slot_class = f->InputSlotClass; + e->input_slot_class = wined3d_input_classification_from_d3d11(f->InputSlotClass); e->instance_data_step_rate = f->InstanceDataStepRate; e->method = WINED3D_DECL_METHOD_DEFAULT; e->usage = 0;

1 0

Chip Davis : d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 31d9d0f7f39b409f73e6046507544fd1e65fd8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d9d0f7f39b409f73e60465… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 16:01:19 2020 +0430 d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2693b94ce7..ad32146947 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -44,7 +44,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (D3DFORMAT)format; switch(format) { @@ -108,7 +109,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (enum wined3d_format_id)format; switch(format) {

1 0

Dmitry Timoshkov : adsldp: Fix a typo in IDirectorySearch::GetNextRow().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: bd34ffbdda450d3e053697eef09d5466c479634e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd34ffbdda450d3e053697ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:09 2020 +0800 adsldp: Fix a typo in IDirectorySearch::GetNextRow(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 550f78bd9a..a4467c0abe 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1317,7 +1317,7 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND if (ldap_ctx->pos >= ldap_ctx->count) return S_ADS_NOMORE_ROWS; - ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res); + ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } if (!ldap_ctx->entry)

1 0

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 220b871236517adb27f497355b428bdc62f47431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220b871236517adb27f49735… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:57 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 952e4931d4..f2773262a6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ typedef struct { ADS_SCOPEENUM scope; int pagesize; + BOOL cache_results; } search; } LDAP_namespace; @@ -1228,6 +1229,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_CACHE_RESULTS: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_CACHE_RESULTS: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("CACHE_RESULTS: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.cache_results = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1728,6 +1742,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; + ldap->search.cache_results = TRUE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : adsldp/tests: Remove no longer needed goto.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 8a3de59fcb5c0bb8b3cfac559c1eead10cd43de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3de59fcb5c0bb8b3cfac55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:12:04 2020 +0800 adsldp/tests: Remove no longer needed goto. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 208a9fa2fe..e76bd2e0b6 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -505,7 +505,6 @@ todo_wine hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) goto fail; hr = IDirectorySearch_GetNextRow(ds, sh); ok(hr == S_OK, "got %#x\n", hr); @@ -517,7 +516,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); IDirectorySearch_Release(ds); -fail: IDirectoryObject_Release(dirobj); }

1 0