[ros-diffs] [sginsberg] 37526: - 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.

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Fri Nov 21 15:05:33 2008
New Revision: 37526

URL: http://svn.reactos.org/svn/reactos?rev=37526&view=rev
Log:
- 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.

Modified:
    trunk/reactos/include/ndk/exfuncs.h
    trunk/reactos/include/ndk/extypes.h
    trunk/reactos/ntoskrnl/ex/locale.c

Modified: trunk/reactos/include/ndk/exfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=37526&r1=37525&r2=37526&view=diff
==============================================================================
--- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Fri Nov 21 15:05:33 2008
@@ -336,7 +336,7 @@
 NTSTATUS
 NTAPI
 NtQueryDefaultUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSCALLAPI
@@ -365,7 +365,7 @@
 NTSTATUS
 NTAPI
 NtQueryInstallUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSCALLAPI
@@ -799,7 +799,7 @@
 NTSTATUS
 NTAPI
 ZwQueryDefaultUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSAPI
@@ -828,7 +828,7 @@
 NTSTATUS
 NTAPI
 ZwQueryInstallUILanguage(
-    PLANGID LanguageId
+    LANGID* LanguageId
 );
 
 NTSYSAPI

Modified: trunk/reactos/include/ndk/extypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=37526&r1=37525&r2=37526&view=diff
==============================================================================
--- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Fri Nov 21 15:05:33 2008
@@ -49,7 +49,9 @@
 //
 // 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

Modified: trunk/reactos/ntoskrnl/ex/locale.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=37526&r1=37525&r2=37526&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Fri Nov 21 15:05:33 2008
@@ -29,7 +29,7 @@
 NTSTATUS
 NTAPI
 ExpGetCurrentUserUILanguage(IN PWSTR MuiName,
-                            OUT PLANGID LanguageId)
+                            OUT LANGID* LanguageId)
 {
     UCHAR ValueBuffer[256];
     PKEY_VALUE_PARTIAL_INFORMATION ValueInfo;
@@ -313,7 +313,7 @@
  */
 NTSTATUS
 NTAPI
-NtQueryInstallUILanguage(OUT PLANGID LanguageId)
+NtQueryInstallUILanguage(OUT LANGID* LanguageId)
 {
     NTSTATUS Status = STATUS_SUCCESS;
     PAGED_CODE();
@@ -347,7 +347,7 @@
  */
 NTSTATUS
 NTAPI
-NtQueryDefaultUILanguage(OUT PLANGID LanguageId)
+NtQueryDefaultUILanguage(OUT LANGID* LanguageId)
 {
     NTSTATUS Status = STATUS_SUCCESS;
     PAGED_CODE();