Michael Stefaniuc : ntdsapi: Use wide-char string literals.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Sun Oct 11 22:05:24 2020 +0200

ntdsapi: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/ntdsapi/ntdsapi.c       |  3 +--
 dlls/ntdsapi/tests/ntdsapi.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c
index 8966a679ac..929b994484 100644
--- a/dlls/ntdsapi/ntdsapi.c
+++ b/dlls/ntdsapi/ntdsapi.c
@@ -130,10 +130,9 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name,

if (inst_port)
     {
-        static const WCHAR percentU[] = {'%','u',0};
         *p = ':';
         p++;
-        wsprintfW(p, percentU, inst_port);
+        wsprintfW(p, L"%u", inst_port);
         p += lstrlenW(p);
     }

diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c
index b6dc1856a4..77dd675fc9 100644
--- a/dlls/ntdsapi/tests/ntdsapi.c
+++ b/dlls/ntdsapi/tests/ntdsapi.c
@@ -33,15 +33,15 @@ static void test_DsMakeSpn(void)
     DWORD ret;
     WCHAR spn[256];
     DWORD spn_length;
-    static const WCHAR wszServiceClass[] = {'c','l','a','s','s',0};
-    static const WCHAR wszServiceHost[] = {'h','o','s','t',0};
-    static const WCHAR wszInstanceName[] = {'i','n','s','t','a','n','c','e',0};
-    static const WCHAR wszReferrer[] = {'r','e','f','e','r','r','e','r',0};
-    static const WCHAR wszSpn1[] = {'c','l','a','s','s','/','h','o','s','t',0};
-    static const WCHAR wszSpn2[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e','/','h','o','s','t',0};
-    static const WCHAR wszSpn3[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0};
-    static const WCHAR wszSpn4[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0};
-    static const WCHAR wszSpn5[] = {'c','l','a','s','s','/','h','o','s','t',':','5','5','5',0};
+    static const WCHAR wszServiceClass[] = L"class";
+    static const WCHAR wszServiceHost[] = L"host";
+    static const WCHAR wszInstanceName[] = L"instance";
+    static const WCHAR wszReferrer[] = L"referrer";
+    static const WCHAR wszSpn1[] = L"class/host";
+    static const WCHAR wszSpn2[] = L"class/instance/host";
+    static const WCHAR wszSpn3[] = L"class/instance:555/host";
+    static const WCHAR wszSpn4[] = L"class/instance:555/host";
+    static const WCHAR wszSpn5[] = L"class/host:555";

spn[0] = '\0';

@@ -86,9 +86,9 @@ static void test_DsMakeSpn(void)

static void test_DsClientMakeSpnForTargetServer(void)
 {
-    static const WCHAR classW[] = {'c','l','a','s','s',0};
-    static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0};
-    static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0};
+    static const WCHAR classW[] = L"class";
+    static const WCHAR hostW[] = L"host.domain";
+    static const WCHAR resultW[] = L"class/host.domain";
     DWORD ret, len;
     WCHAR buf[256];