sync to trunk head (37853) (except rbuild changes)

[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / kbdlayout.c

diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index 4b8822b..b56b85e 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -20,7 +20,7 @@
 PKBL KBLList = NULL; // Keyboard layout list.\r
 \r
 typedef PVOID (*KbdLayerDescriptor)(VOID);\r
-NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module,\r
+NTSTATUS APIENTRY LdrGetProcedureAddress(PVOID module,\r
                                         PANSI_STRING import_name,\r
                                         DWORD flags,\r
                                         PVOID *func_addr);\r
@@ -40,7 +40,7 @@ NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module,
  * Returns NTSTATUS\r
  */\r
 \r
-static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName,\r
+static NTSTATUS APIENTRY ReadRegistryValue( PUNICODE_STRING KeyName,\r
       PUNICODE_STRING ValueName,\r
       PUNICODE_STRING ReturnedValue )\r
 {\r
@@ -467,7 +467,7 @@ UserGetKeyboardLayout(
 }\r
 \r
 UINT\r
-STDCALL\r
+APIENTRY\r
 NtUserGetKeyboardLayoutList(\r
    INT nItems,\r
    HKL* pHklBuff)\r
@@ -488,7 +488,7 @@ NtUserGetKeyboardLayoutList(
    }\r
    else\r
    {\r
-      _SEH_TRY\r
+      _SEH2_TRY\r
       {\r
          ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4);\r
 \r
@@ -504,12 +504,12 @@ NtUserGetKeyboardLayoutList(
          }\r
 \r
       }\r
-      _SEH_HANDLE\r
+      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)\r
       {\r
-         SetLastNtError(_SEH_GetExceptionCode());\r
+         SetLastNtError(_SEH2_GetExceptionCode());\r
          Ret = 0;\r
       }\r
-      _SEH_END;\r
+      _SEH2_END;\r
    }\r
 \r
    UserLeave();\r
@@ -517,7 +517,7 @@ NtUserGetKeyboardLayoutList(
 }\r
 \r
 BOOL\r
-STDCALL\r
+APIENTRY\r
 NtUserGetKeyboardLayoutName(\r
    LPWSTR lpszName)\r
 {\r
@@ -527,7 +527,7 @@ NtUserGetKeyboardLayoutName(
 \r
    UserEnterShared();\r
 \r
-   _SEH_TRY\r
+   _SEH2_TRY\r
    {\r
       ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1);\r
       pti = PsGetCurrentThreadWin32Thread();\r
@@ -535,12 +535,12 @@ NtUserGetKeyboardLayoutName(
       RtlCopyMemory(lpszName,  pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR));\r
       ret = TRUE;\r
    }\r
-   _SEH_HANDLE\r
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)\r
    {\r
-      SetLastNtError(_SEH_GetExceptionCode());\r
+      SetLastNtError(_SEH2_GetExceptionCode());\r
       ret = FALSE;\r
    }\r
-   _SEH_END;\r
+   _SEH2_END;\r
 \r
    UserLeave();\r
    return ret;\r
@@ -548,7 +548,7 @@ NtUserGetKeyboardLayoutName(
 \r
 \r
 HKL\r
-STDCALL\r
+APIENTRY\r
 NtUserLoadKeyboardLayoutEx(\r
    IN HANDLE Handle,\r
    IN DWORD offTable,\r
@@ -609,7 +609,7 @@ the_end:
 }\r
 \r
 HKL\r
-STDCALL\r
+APIENTRY\r
 NtUserActivateKeyboardLayout(\r
    HKL hKl,\r
    ULONG Flags)\r
@@ -666,7 +666,7 @@ the_end:
 }\r
 \r
 BOOL\r
-STDCALL\r
+APIENTRY\r
 NtUserUnloadKeyboardLayout(\r
    HKL hKl)\r
 {\r