Alexandre Julliard : user32: Don't include winbase16.h.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu May 27 17:04:08 2010 +0200

user32: Don't include winbase16.h.

---

dlls/user32/exticon.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c
index a720cf3..fb9ff03 100644
--- a/dlls/user32/exticon.c
+++ b/dlls/user32/exticon.c
@@ -37,7 +37,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "wine/winbase16.h"
+#include "winnls.h"
 #include "user_private.h"
 #include "wine/debug.h"

@@ -65,6 +65,26 @@ typedef struct
     icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */
 } icoICONDIR, *LPicoICONDIR;

+typedef struct
+{
+    WORD offset;
+    WORD length;
+    WORD flags;
+    WORD id;
+    WORD handle;
+    WORD usage;
+} NE_NAMEINFO;
+
+typedef struct
+{
+    WORD  type_id;
+    WORD  count;
+    DWORD resloader;
+} NE_TYPEINFO;
+
+#define NE_RSCTYPE_ICON        0x8003
+#define NE_RSCTYPE_GROUP_ICON  0x800e
+
 #include "poppack.h"

#if 0