From 921e0457c5f2f692503a5b56d873bd21a609d3c4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 17 Jun 2019 09:26:13 +0200
Subject: [PATCH] ntdsapi: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/ntdsapi/Makefile.in |  2 ++
 dlls/ntdsapi/ntdsapi.c   | 27 +++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in
index 4e82a1ee3cc..afe29a38fa6 100644
--- a/dlls/ntdsapi/Makefile.in
+++ b/dlls/ntdsapi/Makefile.in
@@ -2,5 +2,7 @@ MODULE    = ntdsapi.dll
 IMPORTLIB = ntdsapi
 IMPORTS   = user32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	ntdsapi.c
diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c
index 003b1a23614..8966a679acf 100644
--- a/dlls/ntdsapi/ntdsapi.c
+++ b/dlls/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;