Alexandre Julliard : include: Define LANGID in wtypes.idl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4e29ceeb77c4eb3a7d66dd1217d0fb375505ee4f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4e29ceeb77c4eb3a7d66dd1217...

Author: Alexandre Julliard 
Date:   Wed Feb  4 15:06:25 2009 +0100

include: Define LANGID in wtypes.idl.

---

dlls/msi/msiserver.idl |    1 -
 include/dimm.idl       |    2 --
 include/mlang.idl      |    5 -----
 include/wtypes.idl     |    1 +
 4 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index ac442db..2189fc4 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -29,7 +29,6 @@ typedef int INSTALLMESSAGE;
 typedef int MSICONDITION;
 typedef int MSIRUNMODE;
 typedef int INSTALLSTATE;
-typedef WORD LANGID;
 cpp_quote("#endif")

[
diff --git a/include/dimm.idl b/include/dimm.idl
index 07e04b2..851ec90 100644
--- a/include/dimm.idl
+++ b/include/dimm.idl
@@ -24,8 +24,6 @@ cpp_quote("#include <imm.h>")

cpp_quote("#if 0")

-typedef WORD LANGID;
-
 typedef struct {
     LPSTR lpReading;
     LPSTR lpWord;
diff --git a/include/mlang.idl b/include/mlang.idl
index bcc0917..ca89711 100644
--- a/include/mlang.idl
+++ b/include/mlang.idl
@@ -22,11 +22,6 @@ import "unknwn.idl";

interface IStream;

-/* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */
-cpp_quote("#ifndef _WINNT_")
-typedef WORD LANGID;
-cpp_quote("#endif")
-
 cpp_quote("#define CPIOD_PEEK          0x40000000")
 cpp_quote("#define CPIOD_FORCE_PROMPT  0x80000000")

diff --git a/include/wtypes.idl b/include/wtypes.idl
index 8378012..c817d08 100644
--- a/include/wtypes.idl
+++ b/include/wtypes.idl
@@ -87,6 +87,7 @@ typedef LONG_PTR LRESULT;

typedef LONG HRESULT;
 typedef DWORD LCID;
+typedef USHORT LANGID;

typedef unsigned __int64 DWORDLONG;
 typedef __int64 LONGLONG;