From 8043706bf0f859b35d7b97091e4aeb9271e59b2e Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Tue, 2 Aug 2022 12:07:09 +0900
Subject: [PATCH] [WIN32KNT_APITEST] Follow-up of #4594 (54b3b73)

CORE-11700
---
 .../ntuser/NtUserGetKeyboardLayoutName.c       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
index ea49ff9de59..4ffe7ac8112 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
@@ -15,17 +15,17 @@ START_TEST(NtUserGetKeyboardLayoutName)
     FN_NtUserGetKeyboardLayoutName fn = (FN_NtUserGetKeyboardLayoutName)NtUserGetKeyboardLayoutName;
     UNICODE_STRING ustr;
     WCHAR szBuff[MAX_PATH];
-    BOOL bHung;
+    BOOL bHung, ret;
 
     /* Try NULL */
-    ok_int(fn(NULL), 0);
+    ok_int(fn(NULL), FALSE);
 
     /* Try szBuff */
-    bHung = FALSE;
-    szBuff[0] = 0;
+    ret = bHung = FALSE;
+    RtlZeroMemory(szBuff, sizeof(szBuff));
     _SEH2_TRY
     {
-        fn(szBuff);
+        ret = fn(szBuff);
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -34,17 +34,18 @@ START_TEST(NtUserGetKeyboardLayoutName)
     _SEH2_END;
 
     ok_int(bHung, FALSE);
+    //ok_int(ret, FALSE); // XP:TRUE, 2k3:FALSE
     ok(szBuff[0] == 0, "szBuff[0] was %d\n", szBuff[0]);
 
     /* Try ustr */
-    szBuff[0] = 0;
+    RtlZeroMemory(szBuff, sizeof(szBuff));
     ustr.Buffer = szBuff;
     ustr.Length = 0;
     ustr.MaximumLength = RTL_NUMBER_OF(szBuff);
-    bHung = FALSE;
+    ret = bHung = FALSE;
     _SEH2_TRY
     {
-        fn(&ustr);
+        ret = fn(&ustr);
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -53,5 +54,6 @@ START_TEST(NtUserGetKeyboardLayoutName)
     _SEH2_END;
 
     ok_int(bHung, FALSE);
+    ok_int(ret, TRUE);
     ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]);
 }