Dmitry Timoshkov : adsldp: Add support for ADS_SEARCHPREF_ATTRIBTYPES_ONLY to IDirectorySearch::SetSearchPreference().

Alexandre Julliard julliard at winehq.org
Wed Apr 8 15:48:32 CDT 2020


Module: wine
Branch: master
Commit: f94d6f72b37b81878004d9c1e9365701ca4b2ac8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f94d6f72b37b81878004d9c1e9365701ca4b2ac8

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Wed Apr  8 17:41:41 2020 +0800

adsldp: Add support for ADS_SEARCHPREF_ATTRIBTYPES_ONLY to IDirectorySearch::SetSearchPreference().

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/adsldp/adsldp.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c
index e5310a9f4b..03fef55f9f 100644
--- a/dlls/adsldp/adsldp.c
+++ b/dlls/adsldp/adsldp.c
@@ -402,6 +402,7 @@ typedef struct
         ADS_SCOPEENUM scope;
         int pagesize;
         BOOL cache_results;
+        BOOL attribtypes_only;
     } search;
 } LDAP_namespace;
 
@@ -1242,6 +1243,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S
             prefs[i].dwStatus = ADS_STATUS_S_OK;
             break;
 
+        case ADS_SEARCHPREF_ATTRIBTYPES_ONLY:
+            if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN)
+            {
+                FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: not supportd dwType %d\n", prefs[i].vValue.dwType);
+                prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE;
+                break;
+            }
+
+            TRACE("ATTRIBTYPES_ONLY: %d\n", prefs[i].vValue.u.Boolean);
+            ldap->search.attribtypes_only = 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;
@@ -1289,7 +1303,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte
         props[count] = NULL;
     }
 
-    err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, FALSE, &ldap_ctx->res);
+    err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, &ldap_ctx->res);
     heap_free(props);
     if (err != LDAP_SUCCESS)
     {
@@ -1872,6 +1886,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj)
     ldap->search.scope = ADS_SCOPE_SUBTREE;
     ldap->search.pagesize = 0;
     ldap->search.cache_results = TRUE;
+    ldap->search.attribtypes_only = FALSE;
     ldap->at = NULL;
     ldap->at_single_count = 0;
     ldap->at_multiple_count = 0;




More information about the wine-cvs mailing list