Added Winelib types.

include/wine/obj_contextmenu.h

 /************************************************************
  *    IContextMenu
+ *
+ * Undocumented:
+ * word95 gets a IContextMenu Interface and calls HandleMenuMsg()
+ * whitch should only a member of IContextMenu2. 
  */
 
 #ifndef __WINE_WINE_OBJ_CONTEXTMENU_H

include/wine/obj_extracticon.h

@@ -17,7 +17,10 @@ extern "C" {
 
 DEFINE_SHLGUID(IID_IExtractIconA,	0x000214EBL, 0, 0);
 DEFINE_SHLGUID(IID_IExtractIconW,	0x000214FAL, 0, 0);
+#define IID_IExtractIcon WINELIB_NAME_AW(IID_IExtractIcon)
+
 typedef struct IExtractIconA IExtractIconA,*LPEXTRACTICONA;
+#define LPEXTRACTICON WINELIB_NAME_AW(LPEXTRACTICON)
 
 /* GetIconLocation() input flags*/
 #define GIL_OPENICON     0x0001      /* allows containers to specify an "open" look */
@@ -48,8 +51,6 @@ ICOM_DEFINE(IExtractIconA,IUnknown)
 #define IExtractIconA_GetIconLocation(p,a,b,c,d,e)	ICOM_CALL5(GetIconLocation,p,a,b,c,d,e)
 #define IExtractIconA_Extract(p,a,b,c,d,e)	ICOM_CALL5(Extract,p,a,b,c,d,e)
 
-#define IExtractIcon        IExtractIconA 
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* defined(__cplusplus) */

include/wine/obj_shellfolder.h

@@ -19,15 +19,18 @@ extern "C" {
 #endif /* defined(__cplusplus) */
 
 /****************************************************************************
-*  STRRET (temporary, move it away)
+*  STRRET
 */
 #define	STRRET_WSTR	0x0000
+#define STRRET_ASTR	0x0003
+
 #define	STRRET_OFFSETA	0x0001
-#define	STRRET_CSTRA	0x0002
-#define STRRET_ASTR	0X0003
-#define STRRET_OFFSETW	0X0004
-#define STRRET_CSTRW	0X0005
+#define STRRET_OFFSETW	0x0004
+#define STRRET_OFFSET WINELIB_NAME_AW(STRRET_OFFSET) 
 
+#define	STRRET_CSTRA	0x0002
+#define STRRET_CSTRW	0x0005
+#define STRRET_CSTR WINELIB_NAME_AW(STRRET_CSTR) 
 
 typedef struct _STRRET
 { UINT uType;		/* STRRET_xxx */
@@ -37,7 +40,7 @@ typedef struct _STRRET
     UINT	uOffset;	/* OffsetINT32o SHITEMID (ANSI) */
     char	cStr[MAX_PATH];	/* Buffer to fill in */
     WCHAR	cStrW[MAX_PATH];
-  }u;
+  } DUMMYUNIONNAME;
 } STRRET,*LPSTRRET;
 
 /*****************************************************************************