wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Matteo Bruni : wined3d: Add a TRACE to wined3d_buffer_copy().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: c5eb2ed2d12e4faeb103e4d5b51cea592cafb872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5eb2ed2d12e4faeb103e4d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:08 2020 +0200 wined3d: Add a TRACE to wined3d_buffer_copy(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cf32ffff6d..47aca9218d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1198,6 +1198,9 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off struct wined3d_context *context; DWORD dst_location; + TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", + dst_buffer, dst_offset, src_buffer, src_offset, size); + buffer_mark_used(dst_buffer); buffer_mark_used(src_buffer);

1 0

Matteo Bruni : wined3d: Add a TRACE to wined3d_buffer_gl_upload_ranges().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 934ddd08bb10106fc1b2c291e07dd531c7d72990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934ddd08bb10106fc1b2c291… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:07 2020 +0200 wined3d: Add a TRACE to wined3d_buffer_gl_upload_ranges(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index af83bb9460..cf32ffff6d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1492,6 +1492,9 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--)

1 0

Matteo Bruni : wined3d: Add a TRACE to wined3d_buffer_gl_download_ranges().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: b2f98ddf4b4ad60e2c73bc13412e6b80c176e6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2f98ddf4b4ad60e2c73bc13… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:06 2020 +0200 wined3d: Add a TRACE to wined3d_buffer_gl_download_ranges(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dffa703dcc..af83bb9460 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1512,6 +1512,9 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--)

1 0

Matteo Bruni : wined3d: Get rid of a WARN in wined3d_query_get_data().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 913ca5c80156774165626d1fe4801878e6c3e3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913ca5c80156774165626d1f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:05 2020 +0200 wined3d: Get rid of a WARN in wined3d_query_get_data(). We've been handling the flags for a while. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 66965020b4..ab3bb74380 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -456,9 +456,6 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, TRACE("query %p, data %p, data_size %u, flags %#x.\n", query, data, data_size, flags); - if (flags) - WARN("Ignoring flags %#x.\n", flags); - if (query->state == QUERY_BUILDING) { WARN("Query is building, returning S_FALSE.\n");

1 0

Akihiro Sagawa : ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 62e13708d0cc01a4a9f613c077a680709bcc2e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e13708d0cc01a4a9f613c0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:45 2020 +0900 ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f737d1294..20143891d3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6252,6 +6252,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { + wined3d_desc.bind_flags &= ~WINED3D_BIND_RENDER_TARGET; wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6c79f70845..7c53c7e2e9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6231,10 +6231,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 34ac5935fb..9e50c1a7bc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5968,10 +5968,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc);

1 0

Akihiro Sagawa : ddraw/tests: Add more managed texture tests.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 8bb3ebced4a7bd11ad929eafe7d7ffb3a6e96463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb3ebced4a7bd11ad929eaf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:42 2020 +0900 ddraw/tests: Add more managed texture tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bb3ebced4a7bd11ad92…

1 0

Dmitry Timoshkov : adsldp: Map 1.2.840.113556.1.4.907 to ADSTYPE_NT_SECURITY_DESCRIPTOR.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: ab54779c61e75f63be278b37bca01ba566124458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab54779c61e75f63be278b37… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:17:22 2020 +0800 adsldp: Map 1.2.840.113556.1.4.907 to ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 + dlls/adsldp/schema.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9a52d78500..550f78bd9a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1484,6 +1484,7 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex } case ADSTYPE_OCTET_STRING: + case ADSTYPE_NT_SECURITY_DESCRIPTOR: { struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 101a84c196..f0ecfc3ac6 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -99,6 +99,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; + if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.907")) + return ADSTYPE_NT_SECURITY_DESCRIPTOR; FIXME("not handled type syntax %s for %s\n", debugstr_w(type->syntax), debugstr_w(name)); return ADSTYPE_CASE_IGNORE_STRING;

1 0

Dmitry Timoshkov : adsldp: Add support for IDirectorySearch::SetSearchPreference(ADS_SEARCHPREF_SECURITY_MASK).
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: af1c34294d30c566a54ea3cd80c3fa6353eec352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1c34294d30c566a54ea3cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:16:59 2020 +0800 adsldp: Add support for IDirectorySearch::SetSearchPreference(ADS_SEARCHPREF_SECURITY_MASK). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/adsldp/tests/ldap.c | 36 +++++++++++++++++++++++++++++- include/iads.idl | 8 +++++++ include/winldap.h | 2 ++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b2a8e61815..9a52d78500 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -45,6 +45,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +#ifndef LDAP_OPT_SERVER_CONTROLS +#define LDAP_OPT_SERVER_CONTROLS 0x0012 +#endif + DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); @@ -1127,6 +1131,7 @@ static ULONG WINAPI search_Release(IDirectorySearch *iface) static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) { LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + HRESULT hr = S_OK; DWORD i; TRACE("%p,%p,%u\n", iface, prefs, count); @@ -1159,6 +1164,56 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S } break; + case ADS_SEARCHPREF_SECURITY_MASK: + { + int security_mask; + ULONG err; + BerElement *ber; + struct berval *berval; + LDAPControlW *ctrls[2], mask; + + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("SECURITY_MASK: %08x\n", prefs[i].vValue.u.Integer); + security_mask = prefs[i].vValue.u.Integer; + if (!security_mask) + security_mask = ADS_SECURITY_INFO_OWNER; + + ber = ber_alloc_t(LBER_USE_DER); + if (!ber || ber_printf(ber, (char *)"{i}", security_mask) == -1 || ber_flatten(ber, &berval) == -1) + { + ber_free(ber, 1); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + break; + } + TRACE("ber: %s\n", debugstr_an(berval->bv_val, berval->bv_len)); + + mask.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.801"; + mask.ldctl_iscritical = TRUE; + mask.ldctl_value.bv_val = berval->bv_val; + mask.ldctl_value.bv_len = berval->bv_len; + ctrls[0] = &mask; + ctrls[1] = NULL; + err = ldap_set_optionW(ldap->ld, LDAP_OPT_SERVER_CONTROLS, ctrls); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_set_option error %#x\n", err); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + hr = S_ADS_ERRORSOCCURRED; + } + else + prefs[i].dwStatus = ADS_STATUS_S_OK; + + ber_bvfree(berval); + ber_free(ber, 1); + break; + } + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1166,7 +1221,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S } } - return S_OK; + return hr; } static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 998581e2f8..80815b07a0 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -465,6 +465,9 @@ static void test_DirectoryObject(void) IDirectoryObject *dirobj; IUnknown *unk; IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref[2]; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) @@ -485,8 +488,39 @@ todo_wine IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDirectorySearch, (void **)&ds); ok(hr == S_OK, "got %#x\n", hr); - IDirectorySearch_Release(ds); + pref[0].dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref[0].vValue.dwType = ADSTYPE_INTEGER; + pref[0].vValue.Integer = ADS_SCOPE_BASE; + pref[0].dwStatus = 0xdeadbeef; + pref[1].dwSearchPref = ADS_SEARCHPREF_SECURITY_MASK; + pref[1].vValue.dwType = ADSTYPE_INTEGER; + pref[1].vValue.Integer = ADS_SECURITY_INFO_OWNER | ADS_SECURITY_INFO_GROUP | ADS_SECURITY_INFO_DACL; + pref[1].dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); +todo_wine + ok(hr == S_ADS_ERRORSOCCURRED, "got %#x\n", hr); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); + /* ldap.forumsys.com doesn't support NT security, real ADs DC - does */ +todo_wine + ok(pref[1].dwStatus == ADS_STATUS_INVALID_SEARCHPREF, "got %d\n", pref[1].dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); +todo_wine + 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); + + hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"nTSecurityDescriptor", &col); + ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); +fail: IDirectoryObject_Release(dirobj); } diff --git a/include/iads.idl b/include/iads.idl index b04ed0846a..e9eaab77be 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -362,6 +362,14 @@ typedef struct _ads_attr_info DWORD dwNumValues; } ADS_ATTR_INFO, *PADS_ATTR_INFO; +typedef enum +{ + ADS_SECURITY_INFO_OWNER = 0x1, + ADS_SECURITY_INFO_GROUP = 0x2, + ADS_SECURITY_INFO_DACL = 0x4, + ADS_SECURITY_INFO_SACL = 0x8 +} ADS_SECURITY_INFO_ENUM; + /***************************************************************************** * IADsContainer interface */ diff --git a/include/winldap.h b/include/winldap.h index bd5acab767..2d41eaa3fa 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -104,6 +104,8 @@ typedef enum { #define LDAP_SCOPE_ONELEVEL 0x01 #define LDAP_SCOPE_SUBTREE 0x02 +#define LBER_USE_DER 0x01 + typedef struct berelement { PCHAR opaque;

1 0

Dmitry Timoshkov : adsldp: Forward IDirectoryObject::QueryInterface() to parent.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 0d49dcd39f47f697bcf21244cc6e5dd889b3bf92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d49dcd39f47f697bcf21244… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:16:08 2020 +0800 adsldp: Forward IDirectoryObject::QueryInterface() to parent. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 5 +++-- dlls/adsldp/tests/ldap.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9a3ac63407..b2a8e61815 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1573,6 +1573,8 @@ static inline LDAP_namespace *impl_from_IDirectoryObject(IDirectoryObject *iface static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -1585,8 +1587,7 @@ static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid return S_OK; } - FIXME("interface %s is not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IADs_QueryInterface(&ldap->IADs_iface, riid, obj); } static ULONG WINAPI dirobj_AddRef(IDirectoryObject *iface) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 120e77053a..998581e2f8 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -459,6 +459,37 @@ todo_wine do_search(&scientists_subtree); } +static void test_DirectoryObject(void) +{ + HRESULT hr; + IDirectoryObject *dirobj; + IUnknown *unk; + IDirectorySearch *ds; + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); +todo_wine + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADs, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + IDirectorySearch_Release(ds); + + IDirectoryObject_Release(dirobj); +} + START_TEST(ldap) { HRESULT hr; @@ -469,6 +500,7 @@ START_TEST(ldap) test_LDAP(); test_ParseDisplayName(); test_DirectorySearch(); + test_DirectoryObject(); CoUninitialize(); }

1 0

Francois Gouget : gameux/tests: Remove unneeded parentheses around a gamestatistics string.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: c1e282d0f9eaa6835df25b93fa5a313479723434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e282d0f9eaa6835df25b93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 2 11:09:57 2020 +0200 gameux/tests: Remove unneeded parentheses around a gamestatistics string. wine_dbgstr_w() already quotes the string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 8d4da4a0f4..192a245e09 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -295,17 +295,17 @@ static void test_gamestatisticsmgr( void ) /* verify values with these which we stored before*/ hr = IGameStatistics_GetCategoryTitle(gs, 0, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 1, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 2, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); /* check result if category doesn't exists */

1 0

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 2020