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

Alexandre Julliard julliard at winehq.org
Fri Oct 9 16:00:44 CDT 2020


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Thu Oct  8 23:27:59 2020 +0200

credui: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/credui/credui_main.c  |  9 +++------
 dlls/credui/tests/credui.c | 30 ++++++++++--------------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c
index 93ccdc20de..f08d1406f9 100644
--- a/dlls/credui/credui_main.c
+++ b/dlls/credui/credui_main.c
@@ -868,9 +868,6 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info,
                                            PSEC_WINNT_AUTH_IDENTITY_OPAQUE *output_id,
                                            BOOL *save, DWORD sspi_flags )
 {
-    static const WCHAR basicW[] = {'B','a','s','i','c',0};
-    static const WCHAR ntlmW[] = {'N','T','L','M',0};
-    static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0};
     WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0};
     WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0};
     DWORD len_username = ARRAY_SIZE(username);
@@ -883,8 +880,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info,
            error, debugstr_w(package), input_id, output_id, save, sspi_flags );
 
     if (!target) return ERROR_INVALID_PARAMETER;
-    if (!package || (wcsicmp( package, basicW ) && wcsicmp( package, ntlmW ) &&
-                     wcsicmp( package, negotiateW )))
+    if (!package || (wcsicmp( package, L"Basic" ) && wcsicmp( package, L"NTLM" ) &&
+                     wcsicmp( package, L"Negotiate" )))
     {
         FIXME( "package %s not supported\n", debugstr_w(package) );
         return ERROR_NO_SUCH_PACKAGE;
@@ -923,7 +920,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info,
         {
             user = ptr + 1;
             len_username = lstrlenW( user );
-            if (!wcsicmp( package, ntlmW ) || !wcsicmp( package, negotiateW ))
+            if (!wcsicmp( package, L"NTLM" ) || !wcsicmp( package, L"Negotiate" ))
             {
                 domain = username;
                 len_domain = ptr - username;
diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c
index 13fbd41c07..f2b71d603c 100644
--- a/dlls/credui/tests/credui.c
+++ b/dlls/credui/tests/credui.c
@@ -36,7 +36,7 @@ static ULONG (SEC_ENTRY *pSspiPromptForCredentialsW)
 
 static void test_CredUIPromptForCredentials(void)
 {
-    static const WCHAR wszServerName[] = {'W','i','n','e','T','e','s','t',0};
+    static const WCHAR wszServerName[] = L"WineTest";
     DWORD ret;
     WCHAR username[256];
     WCHAR password[256];
@@ -77,14 +77,6 @@ static void test_CredUIPromptForCredentials(void)
 
     if (winetest_interactive)
     {
-        static const WCHAR wszCaption1[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0};
-        static const WCHAR wszCaption2[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','I','N','C','O','R','R','E','C','T','_','P','A','S','S','W','O','R','D','|',
-            'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0};
-        static const WCHAR wszCaption3[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','D','O','_','N','O','T','_','P','E','R','S','I','S','T','|',
-            'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0};
-        static const WCHAR wszCaption4[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','P','E','R','S','I','S','T','|',
-            'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0};
-
         ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username,
                                           ARRAY_SIZE(username),
                                           password, ARRAY_SIZE(password),
@@ -96,7 +88,7 @@ static void test_CredUIPromptForCredentials(void)
             ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret);
         }
 
-        credui_info.pszCaptionText = wszCaption1;
+        credui_info.pszCaptionText = L"CREDUI_FLAGS_EXPECT_CONFIRMATION";
         ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, ERROR_ACCESS_DENIED,
                                           username, ARRAY_SIZE(username),
                                           password, ARRAY_SIZE(password),
@@ -108,7 +100,7 @@ static void test_CredUIPromptForCredentials(void)
             ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret);
         }
 
-        credui_info.pszCaptionText = wszCaption2;
+        credui_info.pszCaptionText = L"CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION";
         ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0,
                                           username, ARRAY_SIZE(username),
                                           password, ARRAY_SIZE(password),
@@ -122,7 +114,7 @@ static void test_CredUIPromptForCredentials(void)
 
 
         save = TRUE;
-        credui_info.pszCaptionText = wszCaption3;
+        credui_info.pszCaptionText = L"CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION";
         ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0,
                                           username, ARRAY_SIZE(username),
                                           password, ARRAY_SIZE(password),
@@ -131,7 +123,7 @@ static void test_CredUIPromptForCredentials(void)
         ok(save, "save flag should have been untouched\n");
 
         save = FALSE;
-        credui_info.pszCaptionText = wszCaption4;
+        credui_info.pszCaptionText = L"CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION";
         ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0,
                                           username, ARRAY_SIZE(username),
                                           password, ARRAY_SIZE(password),
@@ -149,8 +141,6 @@ static void test_CredUIPromptForCredentials(void)
 
 static void test_SspiPromptForCredentials(void)
 {
-    static const WCHAR targetW[] = {'S','s','p','i','T','e','s','t',0};
-    static const WCHAR basicW[] = {'b','a','s','i','c',0};
     ULONG ret;
     SECURITY_STATUS status;
     CREDUI_INFOW info;
@@ -166,20 +156,20 @@ static void test_SspiPromptForCredentials(void)
 
     info.cbSize         = sizeof(info);
     info.hwndParent     = NULL;
-    info.pszMessageText = targetW;
-    info.pszCaptionText = basicW;
+    info.pszMessageText = L"SspiTest";
+    info.pszCaptionText = L"basic";
     info.hbmBanner      = NULL;
-    ret = pSspiPromptForCredentialsW( NULL, &info, 0, basicW, NULL, &id, &save, 0 );
+    ret = pSspiPromptForCredentialsW( NULL, &info, 0, L"basic", NULL, &id, &save, 0 );
     ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret );
 
-    ret = pSspiPromptForCredentialsW( targetW, &info, 0, NULL, NULL, &id, &save, 0 );
+    ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, NULL, NULL, &id, &save, 0 );
     ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret );
 
     if (winetest_interactive)
     {
         id = NULL;
         save = -1;
-        ret = pSspiPromptForCredentialsW( targetW, &info, 0, basicW, NULL, &id, &save, 0 );
+        ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, L"basic", NULL, &id, &save, 0 );
         ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret );
         if (ret == ERROR_SUCCESS)
         {




More information about the wine-cvs mailing list