add um::d2d1_1 / rep um::wincodec, more

Cargo.toml

@@ -81,6 +81,9 @@ commdlg = []
 consoleapi = []
 corsym = []
 d2d1 = []
+d2d1_1 = []
+d2d1effects = []
+d2d1effectauthor = []
 d2dbasetypes = []
 d3d10 = []
 d3d10shader = []
@@ -94,6 +97,7 @@ d3dcompiler = []
 dbghelp = []
 dcommon = []
 docobj = []
+documenttarget = []
 dpapi = []
 dsgetdc = []
 dsound = []
@@ -124,6 +128,7 @@ oaidl = []
 objbase = []
 objidl = []
 objidlbase = []
+ocidl = []
 oleauto = []
 pdh = []
 processthreadsapi = []

build.rs

@@ -51,7 +51,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
     ("windef", &["minwindef", "winnt"], &[]),
     ("windowsx", &["minwindef"], &[]),
     ("winerror", &["minwindef"], &[]),
-    ("wtypes", &["minwindef", "winnt", "wtypesbase"], &[]),
+    ("wtypes", &["minwindef", "ntdef", "wtypesbase"], &[]),
     ("wtypesbase", &["minwindef", "rpcndr", "winnt"], &[]),
     // ucrt
     // um
@@ -67,6 +67,9 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
     ("consoleapi", &["minwindef", "wincon", "winnt"], &["kernel32"]),
     ("corsym", &["basetsd", "objidlbase", "unknwnbase", "winnt"], &[]),
     ("d2d1", &["basetsd", "d2dbasetypes", "d3dcommon", "dcommon", "dwrite", "dxgi", "guiddef", "minwindef", "unknwnbase", "wincodec", "windef", "winnt"], &[]),
+    ("d2d1_1", &["basetsd", "minwindef", "guiddef", "dxgiformat", "dxgi", "objidlbase", "winnt", "unknwnbase", "wincodec", "documenttarget", "dcommon", "dwrite", "d2dbasetypes", "d2d1", "d2d1effectauthor"], &["d2d1"]),
+    ("d2d1effects", &[], &[]),
+    ("d2d1effectauthor", &["basetsd", "minwindef", "ntdef", "unknwnbase"], &[]),
     ("d2dbasetypes", &["basetsd", "d3d9types", "minwindef", "windef"], &[]),
     ("d3d10", &["d3dcommon"], &[]),
     ("d3d10shader", &["d3d10", "d3dcommon", "minwindef", "unknwnbase", "winnt"], &[]),
@@ -80,6 +83,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
     ("dbghelp", &["basetsd", "guiddef", "minwindef", "vcruntime", "winnt"], &[]),
     ("dcommon", &["dxgiformat"], &[]),
     ("docobj", &["guiddef", "minwindef", "oaidl", "unknwnbase", "winnt"], &[]),
+    ("documenttarget", &["basetsd", "ntdef", "guiddef", "unknwnbase"], &[]),
     ("dpapi", &["minwindef", "windef", "winnt"], &[]),
     ("dsgetdc", &["guiddef", "minwindef", "winnt"], &[]),
     ("dsound", &["guiddef", "minwindef", "mmsystem", "unknwnbase", "windef", "winerror", "winnt"], &[]),
@@ -110,6 +114,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
     ("objbase", &["minwindef", "combaseapi", "winnt"], &["ole32"]),
     ("objidl", &["basetsd", "guiddef", "minwindef", "wtypesbase", "objidlbase", "unknwnbase", "winnt"], &[]),
     ("objidlbase", &["basetsd", "guiddef", "minwindef", "unknwnbase", "winnt", "wtypesbase"], &[]),
+    ("ocidl", &["minwindef", "wtypesbase", "wtypes", "ntdef", "guiddef", "unknwnbase", "oaidl"], &[]),
     ("oleauto", &["oaidl", "winnt", "wtypes", "wtypesbase"], &["oleaut32"]),
     ("pdh", &["basetsd", "guiddef", "minwindef", "winnt", "wtypesbase", "windef"], &["pdh"]),
     ("processthreadsapi", &["basetsd", "minwinbase", "minwindef", "winnt"], &["kernel32"]),
@@ -124,7 +129,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
     ("unknwnbase", &["guiddef", "minwindef", "winnt"], &[]),
     ("vsserror", &["winnt"], &[]),
     ("winbase", &["basetsd", "cfgmgr32", "guiddef", "minwindef", "winnt"], &[]),
-    ("wincodec", &["basetsd", "dcommon", "guiddef", "minwindef", "unknwnbase", "winnt"], &[]),
+    ("wincodec", &["basetsd", "minwindef", "windef", "winerror", "ntdef", "guiddef", "dxgiformat", "dxgitype", "winnt", "propidl", "objidlbase", "ocidl", "dcommon", "unknwnbase", "d2d1", "d2d1_1"], &[]),
     ("wincon", &["minwinbase", "minwindef", "windef", "wingdi", "winnt"], &["kernel32"]),
     ("wincrypt", &["basetsd", "guiddef", "minwindef", "ncrypt", "vcruntime", "winnt"], &[]),
     ("winevt", &["minwindef", "winnt"], &[]),

src/shared/wtypes.rs

@@ -5,10 +5,11 @@
 // All files in the project carrying such notice may not be copied, modified, or distributed
 // except according to those terms.
 //! Mappings for the contents of wstypes.h
-use ctypes::{c_double, c_short, c_ushort};
-use shared::minwindef::{BYTE, ULONG, USHORT};
+use ctypes::{c_short, c_ushort, c_double, wchar_t};
+use shared::minwindef::{BYTE, USHORT, ULONG, WORD, DWORD};
+use shared::ntdef::{LONG, LONGLONG, ULONGLONG};
 use shared::wtypesbase::{FLAGGED_WORD_BLOB, OLECHAR};
-use um::winnt::{LONGLONG, ULONGLONG};
+
 ENUM!{enum VARENUM {
     VT_EMPTY = 0,
     VT_NULL = 1,
@@ -81,3 +82,14 @@ pub type wireBSTR = *mut FLAGGED_WORD_BLOB;
 pub type BSTR = *mut OLECHAR;
 pub type LPBSTR = *mut BSTR;
 pub type VARIANT_BOOL = c_short;
+STRUCT!{struct userCLIPFORMAT {
+    fContext: LONG,
+    u: __MIDL_IWinTypes_0001,
+}}
+STRUCT!{struct __MIDL_IWinTypes_0001 {
+    data0: usize,
+}}
+UNION!(__MIDL_IWinTypes_0001, data0, dwValue, dwValue_mut, DWORD);
+UNION!(__MIDL_IWinTypes_0001, data0, pwszName, pwszName_mut, *const wchar_t);
+pub type wireCLIPFORMAT = *const userCLIPFORMAT;
+pub type CLIPFORMAT = WORD;