[PATCH 0/1] MR7326: advapi32/tests: Use wide character string literals.

[Alex Henrie (＠alexhenrie)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7326

[PATCH 1/1] advapi32/tests: Use wide character string literals.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/advapi32/tests/cred.c      | 32 ++++++--------
 dlls/advapi32/tests/crypt_md4.c |  2 +-
 dlls/advapi32/tests/security.c  | 18 +++-----
 dlls/advapi32/tests/service.c   | 77 +++++++++++++++------------------
 4 files changed, 55 insertions(+), 74 deletions(-)

diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c
index 24815967ac8..f1fafd3dc3a 100644
--- a/dlls/advapi32/tests/cred.c
+++ b/dlls/advapi32/tests/cred.c
@@ -41,7 +41,7 @@ static BOOL (WINAPI *pCredIsMarshaledCredentialA)(LPCSTR);
 
 #define TEST_TARGET_NAME  "credtest.winehq.org"
 #define TEST_TARGET_NAME2 "credtest2.winehq.org"
-static const WCHAR TEST_PASSWORD[] = {'p','4','$','$','w','0','r','d','!',0};
+static const WCHAR TEST_PASSWORD[] = L"p4$$w0rd!";
 
 static void test_CredReadA(void)
 {
@@ -381,12 +381,12 @@ static void test_domain_password(DWORD cred_type)
 
 static void test_CredMarshalCredentialA(void)
 {
-    static WCHAR emptyW[] = {0};
-    static WCHAR tW[] = {'t',0};
-    static WCHAR teW[] = {'t','e',0};
-    static WCHAR tesW[] = {'t','e','s',0};
-    static WCHAR testW[] = {'t','e','s','t',0};
-    static WCHAR test1W[] = {'t','e','s','t','1',0};
+    static WCHAR emptyW[] = L"";
+    static WCHAR tW[] = L"t";
+    static WCHAR teW[] = L"te";
+    static WCHAR tesW[] = L"tes";
+    static WCHAR testW[] = L"test";
+    static WCHAR test1W[] = L"test1";
     CERT_CREDENTIAL_INFO cert;
     USERNAME_TARGET_CREDENTIAL_INFO username;
     DWORD error;
@@ -565,10 +565,6 @@ static void test_CredUnmarshalCredentialA(void)
 {
     static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0};
     static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0};
-    static const WCHAR tW[] = {'t',0};
-    static const WCHAR teW[] = {'t','e',0};
-    static const WCHAR tesW[] = {'t','e','s',0};
-    static const WCHAR testW[] = {'t','e','s','t',0};
     void *p;
     CERT_CREDENTIAL_INFO *cert;
     const UCHAR *hash;
@@ -604,22 +600,22 @@ static void test_CredUnmarshalCredentialA(void)
         { "@@CAAAAAA", UsernameTargetCredential, NULL },
         { "@@CAAAAAA0B", UsernameTargetCredential, NULL },
         { "@@CAAAAAA0BA", UsernameTargetCredential, NULL },
-        { "@@CCAAAAA0BA", UsernameTargetCredential, tW },
+        { "@@CCAAAAA0BA", UsernameTargetCredential, L"t" },
         { "@@CEAAAAA0BA", UsernameTargetCredential, NULL },
         { "@@CEAAAAA0BAd", UsernameTargetCredential, NULL },
         { "@@CEAAAAA0BAdA", UsernameTargetCredential, NULL },
-        { "@@CEAAAAA0BQZAA", UsernameTargetCredential, teW },
-        { "@@CEAAAAA0BQZAQ", UsernameTargetCredential, teW },
-        { "@@CEAAAAA0BQZAg", UsernameTargetCredential, teW },
-        { "@@CEAAAAA0BQZAw", UsernameTargetCredential, teW },
+        { "@@CEAAAAA0BQZAA", UsernameTargetCredential, L"te" },
+        { "@@CEAAAAA0BQZAQ", UsernameTargetCredential, L"te" },
+        { "@@CEAAAAA0BQZAg", UsernameTargetCredential, L"te" },
+        { "@@CEAAAAA0BQZAw", UsernameTargetCredential, L"te" },
         { "@@CEAAAAA0BQZAAA", UsernameTargetCredential, NULL },
         { "@@CGAAAAA0BQZAMH", UsernameTargetCredential, NULL },
-        { "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, tesW },
+        { "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, L"tes" },
         { "@@CGAAAAA0BQZAMHAA", UsernameTargetCredential, NULL },
         { "@@CCAAAAA0BAA", UsernameTargetCredential, NULL },
         { "@@CBAAAAA0BAA", UsernameTargetCredential, NULL },
         { "@@CAgAAAA0BAA", UsernameTargetCredential, NULL },
-        { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW },
+        { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, L"test" },
         { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL },
     };
 
diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c
index e67becb1f03..e54651beb17 100644
--- a/dlls/advapi32/tests/crypt_md4.c
+++ b/dlls/advapi32/tests/crypt_md4.c
@@ -104,7 +104,7 @@ static void test_SystemFunction007(void)
     BYTE output[0x10];
     BYTE expected[0x10] = { 0x24, 0x0a, 0xf0, 0x9d, 0x84, 0x1c, 0xda, 0xcf, 
                             0x56, 0xeb, 0x6b, 0x96, 0x55, 0xec, 0xcf, 0x0a };
-    WCHAR szFoo[] = {'f','o','o',0 };
+    WCHAR szFoo[] = L"foo";
 
     if (0)
     {
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index e215ab9e5f2..311c7f43980 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3240,8 +3240,6 @@ static void test_SetEntriesInAclW(void)
     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
     SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY };
     EXPLICIT_ACCESSW ExplicitAccess;
-    static const WCHAR wszEveryone[] = {'E','v','e','r','y','o','n','e',0};
-    static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
 
     NewAcl = (PACL)0xdeadbeef;
     res = SetEntriesInAclW(0, NULL, NULL, &NewAcl);
@@ -3297,7 +3295,7 @@ static void test_SetEntriesInAclW(void)
     else
     {
         ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-        ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone;
+        ExplicitAccess.Trustee.ptstrName = (WCHAR *)L"Everyone";
         res = SetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl);
         ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %lu\n", res);
         ok(NewAcl != NULL, "returned acl was NULL\n");
@@ -3327,7 +3325,7 @@ static void test_SetEntriesInAclW(void)
     }
 
     ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-    ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser;
+    ExplicitAccess.Trustee.ptstrName = (WCHAR *)L"CURRENT_USER";
     res = SetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl);
     ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %lu\n", res);
     ok(NewAcl != NULL, "returned acl was NULL\n");
@@ -3354,8 +3352,6 @@ static void test_SetEntriesInAclA(void)
     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
     SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY };
     EXPLICIT_ACCESSA ExplicitAccess;
-    static const CHAR szEveryone[] = {'E','v','e','r','y','o','n','e',0};
-    static const CHAR szCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
 
     NewAcl = (PACL)0xdeadbeef;
     res = SetEntriesInAclA(0, NULL, NULL, &NewAcl);
@@ -3417,7 +3413,7 @@ static void test_SetEntriesInAclA(void)
     else
     {
         ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-        ExplicitAccess.Trustee.ptstrName = (LPSTR)szEveryone;
+        ExplicitAccess.Trustee.ptstrName = (char*)"Everyone";
         res = SetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
         ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %lu\n", res);
         ok(NewAcl != NULL, "returned acl was NULL\n");
@@ -3447,7 +3443,7 @@ static void test_SetEntriesInAclA(void)
     }
 
     ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-    ExplicitAccess.Trustee.ptstrName = (LPSTR)szCurrentUser;
+    ExplicitAccess.Trustee.ptstrName = (char *)"CURRENT_USER";
     res = SetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
     ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %lu\n", res);
     ok(NewAcl != NULL, "returned acl was NULL\n");
@@ -6757,8 +6753,7 @@ static void test_AddMandatoryAce(void)
 
 static void test_system_security_access(void)
 {
-    static const WCHAR testkeyW[] =
-        {'S','O','F','T','W','A','R','E','\\','W','i','n','e','\\','S','A','C','L','t','e','s','t',0};
+    static const WCHAR testkeyW[] = L"SOFTWARE\\Wine\\SACLtest";
     LONG res;
     HKEY hkey;
     PSECURITY_DESCRIPTOR sd;
@@ -7475,7 +7470,6 @@ static void test_child_token_sd(void)
 
 static void test_GetExplicitEntriesFromAclW(void)
 {
-    static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
     SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY };
     PSID everyone_sid = NULL, users_sid = NULL;
@@ -7557,7 +7551,7 @@ static void test_GetExplicitEntriesFromAclW(void)
     LocalFree(new_acl);
 
     access.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-    access.Trustee.ptstrName = (LPWSTR)wszCurrentUser;
+    access.Trustee.ptstrName = (WCHAR *)L"CURRENT_USER";
     res = SetEntriesInAclW(1, &access, old_acl, &new_acl);
     ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %lu\n", res);
     ok(new_acl != NULL, "returned acl was NULL\n");
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index 47ad4b0e2ba..6a1c0ff82b8 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -442,10 +442,6 @@ static void test_get_displayname(void)
     CHAR displayname[4096];
     WCHAR displaynameW[2048];
     DWORD displaysize, tempsize, tempsizeW;
-    static const CHAR deadbeef[] = "Deadbeef";
-    static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0};
-    static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0};
-    static const WCHAR abcW[] = {'A','B','C',0};
     static const CHAR servicename[] = "winetest_displayname";
     static const CHAR pathname[] = "we_dont_care.exe";
 
@@ -477,13 +473,13 @@ static void test_get_displayname(void)
     /* Test for nonexistent service */
     SetLastError(0xdeadbeef);
     displaysize = -1;
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", NULL, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
 
     SetLastError(0xdeadbeef);
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", NULL, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -491,7 +487,7 @@ static void test_get_displayname(void)
 
     displaysize = 15;
     strcpy(displayname, "ABC");
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", displayname, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -499,8 +495,8 @@ static void test_get_displayname(void)
     ok(displayname[0] == 0, "Service name not empty\n");
 
     displaysize = 15;
-    lstrcpyW( displaynameW, abcW );
-    ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize);
+    wcscpy(displaynameW, L"ABC");
+    ret = GetServiceDisplayNameW(scm_handle, L"Deadbeef", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -509,7 +505,7 @@ static void test_get_displayname(void)
 
     displaysize = 0;
     strcpy(displayname, "ABC");
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", displayname, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -517,8 +513,8 @@ static void test_get_displayname(void)
     ok(displayname[0] == 'A', "Service name changed\n");
 
     displaysize = 0;
-    lstrcpyW( displaynameW, abcW );
-    ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize);
+    wcscpy(displaynameW, L"ABC");
+    ret = GetServiceDisplayNameW(scm_handle, L"Deadbeef", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(displaysize == 2, "Service size expected 2, got %ld\n", displaysize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -527,7 +523,7 @@ static void test_get_displayname(void)
 
     displaysize = 1;
     strcpy(displayname, "ABC");
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", displayname, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -535,8 +531,8 @@ static void test_get_displayname(void)
     ok(displayname[0] == 0, "Service name not empty\n");
 
     displaysize = 1;
-    lstrcpyW( displaynameW, abcW );
-    ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize);
+    wcscpy(displaynameW, L"ABC");
+    ret = GetServiceDisplayNameW(scm_handle, L"Deadbeef", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(displaysize == 2, "Service size expected 2, got %ld\n", displaysize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -545,7 +541,7 @@ static void test_get_displayname(void)
 
     displaysize = 2;
     strcpy(displayname, "ABC");
-    ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize);
+    ret = GetServiceDisplayNameA(scm_handle, "Deadbeef", displayname, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -553,8 +549,8 @@ static void test_get_displayname(void)
     ok(displayname[0] == 0, "Service name not empty\n");
 
     displaysize = 2;
-    lstrcpyW( displaynameW, abcW );
-    ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize);
+    wcscpy(displaynameW, L"ABC");
+    ret = GetServiceDisplayNameW(scm_handle, L"Deadbeef", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(displaysize == 2, "Service size expected 2, got %ld\n", displaysize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -626,7 +622,7 @@ static void test_get_displayname(void)
     /* Do the buffer(size) tests also for GetServiceDisplayNameW */
     SetLastError(0xdeadbeef);
     displaysize = -1;
-    ret = GetServiceDisplayNameW(scm_handle, spoolerW, NULL, &displaysize);
+    ret = GetServiceDisplayNameW(scm_handle, L"Spooler", NULL, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
        "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError());
@@ -635,7 +631,7 @@ static void test_get_displayname(void)
     SetLastError(0xdeadbeef);
     tempsizeW = displaysize;
     displaysize = tempsizeW / 2;
-    ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize);
+    ret = GetServiceDisplayNameW(scm_handle, L"Spooler", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(displaysize == tempsizeW, "Expected the needed buffersize\n");
     ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
@@ -644,7 +640,7 @@ static void test_get_displayname(void)
     /* Now with the original returned size */
     SetLastError(0xdeadbeef);
     displaysize = tempsizeW;
-    ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize);
+    ret = GetServiceDisplayNameW(scm_handle, L"Spooler", displaynameW, &displaysize);
     ok(!ret, "Expected failure\n");
     ok(displaysize == tempsizeW, "Expected the needed buffersize\n");
     ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
@@ -653,7 +649,7 @@ static void test_get_displayname(void)
     /* And with a bigger than needed buffer */
     SetLastError(0xdeadbeef);
     displaysize = tempsizeW + 1; /* This caters for the null terminating character */
-    ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize);
+    ret = GetServiceDisplayNameW(scm_handle, L"Spooler", displaynameW, &displaysize);
     ok(ret, "Expected success, got error %lu\n", GetLastError());
     ok(displaysize == tempsizeW, "Expected the needed buffersize\n");
     ok(lstrlenW(displaynameW) == displaysize,
@@ -729,9 +725,6 @@ static void test_get_servicekeyname(void)
     WCHAR displaynameW[4096];
     DWORD servicesize, displaysize, tempsize;
     BOOL ret;
-    static const CHAR deadbeef[] = "Deadbeef";
-    static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0};
-    static const WCHAR abcW[] = {'A','B','C',0};
 
     /* Having NULL for the size of the buffer will crash on W2K3 */
 
@@ -764,7 +757,7 @@ static void test_get_servicekeyname(void)
 
     /* Test for nonexistent displayname */
     SetLastError(0xdeadbeef);
-    ret = GetServiceKeyNameA(scm_handle, deadbeef, NULL, &servicesize);
+    ret = GetServiceKeyNameA(scm_handle, "Deadbeef", NULL, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -772,7 +765,7 @@ static void test_get_servicekeyname(void)
 
     servicesize = 15;
     strcpy(servicename, "ABC");
-    ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize);
+    ret = GetServiceKeyNameA(scm_handle, "Deadbeef", servicename, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -780,8 +773,8 @@ static void test_get_servicekeyname(void)
     ok(servicename[0] == 0, "Service name not empty\n");
 
     servicesize = 15;
-    lstrcpyW( servicenameW, abcW );
-    ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize);
+    wcscpy(servicenameW, L"ABC");
+    ret = GetServiceKeyNameW(scm_handle, L"Deadbeef", servicenameW, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -790,7 +783,7 @@ static void test_get_servicekeyname(void)
 
     servicesize = 0;
     strcpy(servicename, "ABC");
-    ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize);
+    ret = GetServiceKeyNameA(scm_handle, "Deadbeef", servicename, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -798,8 +791,8 @@ static void test_get_servicekeyname(void)
     ok(servicename[0] == 'A', "Service name changed\n");
 
     servicesize = 0;
-    lstrcpyW( servicenameW, abcW );
-    ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize);
+    wcscpy(servicenameW, L"ABC");
+    ret = GetServiceKeyNameW(scm_handle, L"Deadbeef", servicenameW, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(servicesize == 2, "Service size expected 2, got %ld\n", servicesize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -808,7 +801,7 @@ static void test_get_servicekeyname(void)
 
     servicesize = 1;
     strcpy(servicename, "ABC");
-    ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize);
+    ret = GetServiceKeyNameA(scm_handle, "Deadbeef", servicename, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -816,8 +809,8 @@ static void test_get_servicekeyname(void)
     ok(servicename[0] == 0, "Service name not empty\n");
 
     servicesize = 1;
-    lstrcpyW( servicenameW, abcW );
-    ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize);
+    wcscpy(servicenameW, L"ABC");
+    ret = GetServiceKeyNameW(scm_handle, L"Deadbeef", servicenameW, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(servicesize == 2, "Service size expected 2, got %ld\n", servicesize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -826,7 +819,7 @@ static void test_get_servicekeyname(void)
 
     servicesize = 2;
     strcpy(servicename, "ABC");
-    ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize);
+    ret = GetServiceKeyNameA(scm_handle, "Deadbeef", servicename, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %ld\n", GetLastError());
@@ -834,8 +827,8 @@ static void test_get_servicekeyname(void)
     ok(servicename[0] == 0, "Service name not empty\n");
 
     servicesize = 2;
-    lstrcpyW( servicenameW, abcW );
-    ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize);
+    wcscpy(servicenameW, L"ABC");
+    ret = GetServiceKeyNameW(scm_handle, L"Deadbeef", servicenameW, &servicesize);
     ok(!ret, "Expected failure\n");
     ok(servicesize == 2, "Service size expected 2, got %ld\n", servicesize);
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
@@ -2220,9 +2213,7 @@ static void test_queryconfig2(void)
     static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0";
     static const CHAR password    [] = "";
     static const CHAR description [] = "Description";
-    static const CHAR description_empty[] = "";
-    static const WCHAR descriptionW [] = {'D','e','s','c','r','i','p','t','i','o','n','W',0};
-    static const WCHAR descriptionW_empty[] = {0};
+    static const WCHAR descriptionW [] = L"DescriptionW";
 
     if(!pQueryServiceConfig2A)
     {
@@ -2403,7 +2394,7 @@ static void test_queryconfig2(void)
     ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription),
         "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription);
 
-    pConfig->lpDescription = (LPSTR)description_empty;
+    pConfig->lpDescription = (char*)"";
     ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer);
     ok(ret, "expected ChangeServiceConfig2A to succeed\n");
 
@@ -2433,7 +2424,7 @@ static void test_queryconfig2(void)
     ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription),
         "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription));
 
-    pConfigW->lpDescription = (LPWSTR)descriptionW_empty;
+    pConfigW->lpDescription = (WCHAR*)L"";
     ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer);
     ok(ret, "expected ChangeServiceConfig2W to succeed\n");
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7326