- Remove non-standard "PLANGID" type from NDK and use LANGID* instead. Also protect LANGID definition with a header guard, as winnt.h defines it too.

svn path=/trunk/; revision=37526

reactos/include/ndk/exfuncs.h

@@ -336,7 +336,7 @@ NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQueryDefaultUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSCALLAPI
@@ -365,7 +365,7 @@ NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQueryInstallUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSCALLAPI
@@ -799,7 +799,7 @@ NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryDefaultUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSAPI
@@ -828,7 +828,7 @@ NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryInstallUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSAPI

reactos/include/ndk/extypes.h

@@ -49,7 +49,9 @@ Author:
 //
 // Atom and Language IDs
 //
-typedef USHORT LANGID, *PLANGID;
+#ifndef NTOS_MODE_USER
+typedef USHORT LANGID;
+#endif
 typedef USHORT RTL_ATOM, *PRTL_ATOM;
 
 #ifndef NTOS_MODE_USER

reactos/ntoskrnl/ex/locale.c

@@ -29,7 +29,7 @@ LCID PsDefaultThreadLocaleId = LANGIDFROMLCID(0x00000409);
 NTSTATUS
 NTAPI
 ExpGetCurrentUserUILanguage(IN PWSTR MuiName,
-                            OUT PLANGID LanguageId)
+                            OUT LANGID* LanguageId)
 {
     UCHAR ValueBuffer[256];
     PKEY_VALUE_PARTIAL_INFORMATION ValueInfo;
@@ -313,7 +313,7 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile,
  */
 NTSTATUS
 NTAPI
-NtQueryInstallUILanguage(OUT PLANGID LanguageId)
+NtQueryInstallUILanguage(OUT LANGID* LanguageId)
 {
     NTSTATUS Status = STATUS_SUCCESS;
     PAGED_CODE();
@@ -347,7 +347,7 @@ NtQueryInstallUILanguage(OUT PLANGID LanguageId)
  */
 NTSTATUS
 NTAPI
-NtQueryDefaultUILanguage(OUT PLANGID LanguageId)
+NtQueryDefaultUILanguage(OUT LANGID* LanguageId)
 {
     NTSTATUS Status = STATUS_SUCCESS;
     PAGED_CODE();