[reactos] 01/01: [NTDSAPI] Sync with Wine Staging 4.18. CORE-16441

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cf1f80a0e3420e066adb…

commit 4cf1f80a0e3420e066adbb035d854cf32af22b4f
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Nov 10 14:09:00 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Nov 10 14:09:00 2019 +0100

    [NTDSAPI] Sync with Wine Staging 4.18. CORE-16441
---
 dll/win32/ntdsapi/ntdsapi.c | 27 +++++++++++++--------------
 media/doc/README.WINE       |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dll/win32/ntdsapi/ntdsapi.c b/dll/win32/ntdsapi/ntdsapi.c
index 003b1a23614..8966a679acf 100644
--- a/dll/win32/ntdsapi/ntdsapi.c
+++ b/dll/win32/ntdsapi/ntdsapi.c
@@ -24,7 +24,6 @@
 #include "winuser.h"
 #include "ntdsapi.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi);
 
@@ -83,11 +82,11 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name,
     if (!svc_class || !svc_name)
         return ERROR_INVALID_PARAMETER;
 
-    new_spn_length = strlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating
'\0' */;
+    new_spn_length = lstrlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating
'\0' */;
     if (inst_name)
-        new_spn_length += strlenW(inst_name);
+        new_spn_length += lstrlenW(inst_name);
     else
-        new_spn_length += strlenW(svc_name);
+        new_spn_length += lstrlenW(svc_name);
     if (inst_port)
     {
         USHORT n = inst_port;
@@ -99,7 +98,7 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name,
         } while (n != 0);
     }
     if (inst_name)
-        new_spn_length += 1 /* for '/' */ + strlenW(svc_name);
+        new_spn_length += 1 /* for '/' */ + lstrlenW(svc_name);
 
     if (*spn_length < new_spn_length)
     {
@@ -109,21 +108,21 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name,
     *spn_length = new_spn_length;
 
     p = spn;
-    len = strlenW(svc_class);
+    len = lstrlenW(svc_class);
     memcpy(p, svc_class, len * sizeof(WCHAR));
     p += len;
     *p = '/';
     p++;
     if (inst_name)
     {
-        len = strlenW(inst_name);
+        len = lstrlenW(inst_name);
         memcpy(p, inst_name, len * sizeof(WCHAR));
         p += len;
         *p = '\0';
     }
     else
     {
-        len = strlenW(svc_name);
+        len = lstrlenW(svc_name);
         memcpy(p, svc_name, len * sizeof(WCHAR));
         p += len;
         *p = '\0';
@@ -135,14 +134,14 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name,
         *p = ':';
         p++;
         wsprintfW(p, percentU, inst_port);
-        p += strlenW(p);
+        p += lstrlenW(p);
     }
 
     if (inst_name)
     {
         *p = '/';
         p++;
-        len = strlenW(svc_name);
+        len = lstrlenW(svc_name);
         memcpy(p, svc_name, len * sizeof(WCHAR));
         p += len;
         *p = '\0';
@@ -216,7 +215,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR
name, DWORD
 
     if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER;
 
-    len = strlenW(class) + 1 + strlenW(name) + 1;
+    len = lstrlenW(class) + 1 + lstrlenW(name) + 1;
     if (*buflen < len)
     {
         *buflen = len;
@@ -224,10 +223,10 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR
name, DWORD
     }
     *buflen = len;
 
-    memcpy(buf, class, strlenW(class) * sizeof(WCHAR));
-    p = buf + strlenW(class);
+    memcpy(buf, class, lstrlenW(class) * sizeof(WCHAR));
+    p = buf + lstrlenW(class);
     *p++ = '/';
-    memcpy(p, name, strlenW(name) * sizeof(WCHAR));
+    memcpy(p, name, lstrlenW(name) * sizeof(WCHAR));
     buf[len - 1] = 0;
 
     return ERROR_SUCCESS;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index a793e1d3dec..fa1e7c39464 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -136,7 +136,7 @@ dll/win32/msxml6              # Synced to WineStaging-3.3
 dll/win32/nddeapi             # Synced to WineStaging-3.3
 dll/win32/netapi32            # Forked at Wine-1.3.34
 dll/win32/npptools            # Synced to WineStaging-4.18
-dll/win32/ntdsapi             # Synced to WineStaging-3.9
+dll/win32/ntdsapi             # Synced to WineStaging-4.18
 dll/win32/objsel              # Synced to WineStaging-3.3
 dll/win32/odbc32              # Synced to WineStaging-4.0. Depends on port of Linux
ODBC.
 dll/win32/odbccp32            # Synced to WineStaging-4.0