[PATCH 3/6] adsldp: Initialize also pADsValues->dwType field.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/adsldp/adsldp.c     | 5 +++++
 dlls/adsldp/tests/ldap.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c
index 8af7a59632..d2b43977e3 100644
--- a/dlls/adsldp/adsldp.c
+++ b/dlls/adsldp/adsldp.c
@@ -1345,6 +1345,7 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex
         for (i = 0; i < count; i++)
         {
             TRACE("=> %s\n", debugstr_w(values[i]));
+            col->pADsValues[i].dwType = type;
             col->pADsValues[i].u.CaseIgnoreString = values[i];
         }
 
@@ -1371,6 +1372,8 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex
 
         for (i = 0; i < count; i++)
         {
+            col->pADsValues[i].dwType = type;
+
             if (wcsicmp(values[i], L"TRUE"))
                 col->pADsValues[i].u.Boolean = 1;
             else if (wcsicmp(values[i], L"FALSE"))
@@ -1436,6 +1439,7 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex
         for (i = 0; i < count; i++)
         {
             TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len));
+            col->pADsValues[i].dwType = type;
             col->pADsValues[i].u.OctetString.dwLength = values[i]->bv_len;
             col->pADsValues[i].u.OctetString.lpValue = (BYTE *)values[i]->bv_val;
         }
@@ -1489,6 +1493,7 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL
         wcscat(col->pADsValues[0].u.CaseIgnoreString, ldap->host);
         wcscat(col->pADsValues[0].u.CaseIgnoreString, L"/");
         if (dn) wcscat(col->pADsValues[0].u.CaseIgnoreString, dn);
+        col->pADsValues[0].dwType = ADSTYPE_CASE_IGNORE_STRING;
         col->dwADsType = ADSTYPE_CASE_IGNORE_STRING;
         col->dwNumValues = 1;
         col->pszAttrName = strdupW(name);
diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c
index 3c1d47755d..120e77053a 100644
--- a/dlls/adsldp/tests/ldap.c
+++ b/dlls/adsldp/tests/ldap.c
@@ -271,6 +271,8 @@ static void do_search(const struct search *s)
 
             for (i = 0; i < col.dwNumValues; i++)
             {
+                ok(col.pADsValues[i].dwType == col.dwADsType, "%u: got %d for %s\n", i, col.pADsValues[i].dwType, wine_dbgstr_w(name));
+
                 ok(res->values[i] != NULL, "expected to have more values for %s\n", wine_dbgstr_w(name));
                 if (!res->values[i]) break;
 
-- 
2.25.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=68542

Your paranoid android.


=== w864 (64 bit report) ===

adsldp:
ldap.c:194: Test failed: 10: got 0x8007203a, expected 0