Added various type and macro definitions that are needed to compile
the latest MFC.

diff --git a/include/commctrl.h b/include/commctrl.h
index 733ce43..57da501 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -3091,12 +3091,15 @@
 #define CBEM_SETITEMA         (WM_USER+5)
 #define CBEM_SETITEMW         (WM_USER+12)
 #define CBEM_SETITEM            WINELIB_NAME_AW(CBEM_SETITEM)
+#define CBEM_DELETEITEM         CB_DELETESTRING
 #define CBEM_GETCOMBOCONTROL    (WM_USER+6)
 #define CBEM_GETEDITCONTROL     (WM_USER+7)
 #define CBEM_SETEXSTYLE         (WM_USER+8)
 #define CBEM_GETEXSTYLE         (WM_USER+9)
 #define CBEM_GETEXTENDEDSTYLE   (WM_USER+9)
 #define CBEM_SETEXTENDEDSTYLE   (WM_USER+14)
+#define CBEM_SETUNICODEFORMAT   CCM_SETUNICODEFORMAT
+#define CBEM_GETUNICODEFORMAT   CCM_GETUNICODEFORMAT
 #define CBEM_HASEDITCHANGED     (WM_USER+10)
 #define CBEM_SETUNICODEFORMAT   CCM_SETUNICODEFORMAT
 #define CBEM_GETUNICODEFORMAT   CCM_GETUNICODEFORMAT