Skip to content

Commit

Permalink
Finish porting advapi32 to v0.3 (#447)
Browse files Browse the repository at this point in the history
* Mark timezoneapi as dependent on advapi32.dll

* Add advapi32 functions to winsvc

* Add accctrl in preparation for aclapi

* Add aclapi

* Add ImpersonateNamedPipeClient to namedpipeapi

Fixes:
- Add namedpipeapi to Cargo.toml
- Typo correction in namedpipeapi header

* Add advapi32 functions to lsalookup

* Add winefs

* Add advapi32 functions to wincred

* Add wct

* Add advapi32 functions to securitybaseapi

* Add advapi32 functions to processthreadsapi

* Add advapi32 functions to ntsecapi

* Add evntprov

* Add wmistr

* Add evntrace and evntcons

* Add sddl

* Add appmgmt

* Add ntlsa

* Add mschapp

* Add perflib

* Add winsafer

* Fix securitybaseapi imports
  • Loading branch information
austinwagner authored and retep998 committed Apr 6, 2018
1 parent f46a1ca commit 4a69b4a
Show file tree
Hide file tree
Showing 25 changed files with 6,530 additions and 191 deletions.
14 changes: 14 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ dxgi1_4 = []
dxgi1_5 = []
dxgiformat = []
dxgitype = []
evntprov = []
evntrace = []
guiddef = []
hidclass = []
hidpi = []
Expand All @@ -75,6 +77,7 @@ qos = []
rpc = []
rpcdce = []
rpcndr = []
sddl = []
sspi = []
stralign = []
tvout = []
Expand All @@ -85,13 +88,17 @@ windef = []
windowsx = []
winerror = []
winusbio = []
wmistr = []
wnnc = []
ws2def = []
ws2ipdef = []
wtypes = []
wtypesbase = []
#ucrt
#um
accctrl = []
aclapi = []
appmgmt = []
audioclient = []
audiosessiontypes = []
avrt = []
Expand Down Expand Up @@ -169,6 +176,7 @@ dxdiag = []
dxfile = []
dxgidebug = []
errhandlingapi = []
evntcons = []
fibersapi = []
fileapi = []
"gl-gl" = []
Expand Down Expand Up @@ -208,11 +216,13 @@ mmeapi = []
mmsystem = []
msaatext = []
mscat = []
mschapp = []
mssip = []
namedpipeapi = []
namespaceapi = []
nb30 = []
ncrypt = []
ntlsa = []
ntsecapi = []
oaidl = []
objbase = []
Expand All @@ -222,6 +232,7 @@ ocidl = []
oleauto = []
olectl = []
pdh = []
perflib = []
playsoundapi = []
powerbase = []
powersetting = []
Expand Down Expand Up @@ -284,6 +295,7 @@ vsbackup = []
vss = []
vsserror = []
vswriter = []
wct = []
werapi = []
winbase = []
wincodec = []
Expand All @@ -292,6 +304,7 @@ wincon = []
wincred = []
wincrypt = []
windowsceip = []
winefs = []
winevt = []
wingdi = []
winhttp = []
Expand All @@ -302,6 +315,7 @@ winnetwk = []
winnls = []
winnt = []
winreg = []
winsafer = []
winscard = []
winsmcrd = []
winsock2 = []
Expand Down
22 changes: 18 additions & 4 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("dxgi1_5", &["basetsd", "dxgi", "dxgi1_2", "dxgi1_3", "dxgi1_4", "dxgiformat", "minwindef", "unknwnbase", "winnt"], &[]),
("dxgiformat", &[], &[]),
("dxgitype", &["d3d9types", "dxgiformat", "minwindef"], &[]),
("evntprov", &["basetsd", "guiddef", "minwindef", "winnt"], &["advapi32"]),
("evntrace", &["basetsd", "evntcons", "evntprov", "guiddef", "handleapi", "minwindef", "timezoneapi", "vadefs", "winnt", "wmistr"], &["advapi32"]),
("guiddef", &[], &[]),
("hidclass", &["guiddef", "minwindef", "winioctl", "winnt"], &[]),
("hidpi", &["hidusage", "minwindef", "ntdef", "ntstatus", "winnt"], &["hid"]),
Expand All @@ -54,6 +56,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("rpc", &[], &[]),
("rpcdce", &["guiddef", "minwindef", "rpc"], &[]),
("rpcndr", &[], &[]),
("sddl", &["basetsd", "minwindef", "winnt"], &["advapi32"]),
("sspi", &["basetsd", "guiddef", "minwindef", "subauth", "wincred", "winnt"], &["credui", "secur32"]),
("stralign", &["vcruntime", "winnt"], &["kernel32"]),
("tvout", &["guiddef", "minwindef"], &[]),
Expand All @@ -64,13 +67,17 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("windowsx", &["minwindef"], &[]),
("winerror", &["minwindef"], &[]),
("winusbio", &["minwindef", "usb"], &[]),
("wmistr", &["basetsd", "guiddef", "minwindef", "winnt"], &[]),
("wnnc", &["minwindef"], &[]),
("ws2def", &["basetsd", "guiddef", "inaddr", "minwindef", "vcruntime", "winnt"], &[]),
("ws2ipdef", &["in6addr", "inaddr", "minwindef", "ws2def"], &[]),
("wtypes", &["guiddef", "minwindef", "ntdef", "wtypesbase"], &[]),
("wtypesbase", &["minwindef", "rpcndr", "winnt"], &[]),
// ucrt
// um
("accctrl", &["guiddef", "minwindef", "winbase", "winnt"], &[]),
("aclapi", &["accctrl", "guiddef", "minwindef", "winnt"], &["advapi32"]),
("appmgmt", &["guiddef", "minwindef", "winnt"], &["advapi32"]),
("audioclient", &["audiosessiontypes", "basetsd", "guiddef", "minwindef", "mmreg", "strmif", "unknwnbase", "winerror", "winnt", "wtypesbase"], &[]),
("audiosessiontypes", &["minwindef"], &[]),
("avrt", &["guiddef", "minwindef", "winnt"], &["avrt"]),
Expand Down Expand Up @@ -148,6 +155,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("dxfile", &[], &[]),
("dxgidebug", &[], &[]),
("errhandlingapi", &["basetsd", "minwindef", "winnt"], &["kernel32"]),
("evntcons", &["basetsd", "evntprov", "evntrace", "guiddef", "minwindef", "winnt"], &["advapi32"]),
("fibersapi", &["minwindef", "winnt"], &["kernel32"]),
("fileapi", &["minwinbase", "minwindef", "winnt"], &["kernel32"]),
("gl-gl", &[], &["opengl32"]),
Expand Down Expand Up @@ -178,7 +186,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("lmsvc", &["lmcons", "minwindef", "winnt"], &["netapi32"]),
("lmuse", &["lmcons", "minwindef", "winnt"], &["netapi32"]),
("lmwksta", &["lmcons", "minwindef", "winnt"], &["netapi32"]),
("lsalookup", &["guiddef", "minwindef", "winnt"], &[]),
("lsalookup", &["guiddef", "minwindef", "ntdef", "winnt"], &["advapi32"]),
("memoryapi", &["basetsd", "minwinbase", "minwindef", "winnt"], &["kernel32"]),
("minschannel", &["guiddef", "minwindef", "wincrypt", "winnt"], &[]),
("minwinbase", &["basetsd", "minwindef", "ntstatus", "winnt"], &[]),
Expand All @@ -187,11 +195,13 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("mmsystem", &["basetsd", "minwindef", "mmreg", "winnt"], &[]),
("msaatext", &[], &[]),
("mscat", &["guiddef", "minwindef", "mssip", "wincrypt", "winnt"], &[]),
("mschapp", &["basetsd", "minwindef", "winnt"], &["advapi32"]),
("mssip", &["guiddef", "minwindef", "mscat", "wincrypt", "winnt"], &["crypt32"]),
("namedpipeapi", &["minwinbase", "minwindef", "winnt"], &["kernel32"]),
("namedpipeapi", &["minwinbase", "minwindef", "winnt"], &["advapi32", "kernel32"]),
("namespaceapi", &["minwinbase", "minwindef", "ntdef", "winnt"], &["kernel32"]),
("nb30", &["minwindef", "winnt"], &["netapi32"]),
("ncrypt", &["basetsd", "sspi"], &["ncrypt"]),
("ntlsa", &["basetsd", "guiddef", "lsalookup", "minwindef", "ntdef", "ntsecapi", "subauth", "winnt"], &["advapi32"]),
("ntsecapi", &["basetsd", "guiddef", "lsalookup", "minwindef", "ntdef", "sspi", "subauth", "winnt"], &["advapi32"]),
("oaidl", &["basetsd", "guiddef", "minwindef", "rpcndr", "unknwnbase", "winnt", "wtypes", "wtypesbase"], &[]),
("objbase", &["combaseapi", "minwindef", "winnt"], &["ole32"]),
Expand All @@ -201,6 +211,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("oleauto", &["basetsd", "minwinbase", "minwindef", "oaidl", "winnt", "wtypes", "wtypesbase"], &["oleaut32"]),
("olectl", &["winerror", "winnt"], &[]),
("pdh", &["basetsd", "guiddef", "minwindef", "windef", "winnt"], &["pdh"]),
("perflib", &["basetsd", "guiddef", "minwinbase", "minwindef", "winnt"], &["advapi32"]),
("playsoundapi", &["minwindef", "winnt"], &["winmm"]),
("powerbase", &["minwindef", "winnt", "winuser"], &["powrprof"]),
("powersetting", &["guiddef", "minwindef", "winnt", "winuser"], &["powrprof"]),
Expand All @@ -226,7 +237,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("sapiddk51", &["guiddef", "minwindef", "mmreg", "oaidl", "objidlbase", "sapi", "unknwnbase", "windef", "winnt"], &[]),
("schannel", &["guiddef", "minwindef", "wincrypt", "windef", "winnt"], &[]),
("securityappcontainer", &["minwindef", "winnt"], &["kernel32"]),
("securitybaseapi", &["minwindef", "winnt"], &["advapi32", "kernel32"]),
("securitybaseapi", &["guiddef", "minwinbase", "minwindef", "winnt"], &["advapi32", "kernel32"]),
("servprov", &["guiddef", "unknwnbase", "winnt"], &[]),
("setupapi", &["basetsd", "commctrl", "devpropdef", "guiddef", "minwindef", "prsht", "spapidef", "windef", "winnt", "winreg"], &["setupapi"]),
("shellapi", &["basetsd", "guiddef", "minwinbase", "minwindef", "processthreadsapi", "windef", "winnt", "winuser"], &["shell32", "shlwapi"]),
Expand All @@ -251,7 +262,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("threadpoolapiset", &["basetsd", "minwinbase", "minwindef", "winnt"], &["kernel32"]),
("threadpoollegacyapiset", &["minwinbase", "minwindef", "winnt"], &["kernel32"]),
("timeapi", &["minwindef", "mmsystem"], &["winmm"]),
("timezoneapi", &["minwinbase", "minwindef", "winnt"], &["kernel32"]),
("timezoneapi", &["minwinbase", "minwindef", "winnt"], &["advapi32", "kernel32"]),
("tlhelp32", &["basetsd", "minwindef", "winnt"], &["kernel32"]),
("unknwnbase", &["guiddef", "minwindef", "winnt"], &[]),
("urlhist", &["docobj", "guiddef", "minwindef", "unknwnbase", "winnt", "wtypesbase"], &[]),
Expand All @@ -263,6 +274,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("vss", &["guiddef", "minwindef", "unknwnbase", "winnt"], &[]),
("vsserror", &["winnt"], &[]),
("vswriter", &["minwindef", "unknwnbase", "vss", "winnt", "wtypes"], &[]),
("wct", &["basetsd", "guiddef", "minwindef", "winnt"], &["advapi32"]),
("werapi", &["minwindef", "winnt"], &["kernel32"]),
("winbase", &["basetsd", "cfgmgr32", "fileapi", "guiddef", "libloaderapi", "minwinbase", "minwindef", "processthreadsapi", "vadefs", "windef", "winnt"], &["kernel32"]),
("wincodec", &["basetsd", "d2d1", "d2d1_1", "dcommon", "dxgiformat", "dxgitype", "guiddef", "minwindef", "ntdef", "objidlbase", "ocidl", "propidl", "unknwnbase", "windef", "winerror", "winnt"], &["windowscodecs"]),
Expand All @@ -271,6 +283,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("wincred", &["minwindef", "sspi", "windef", "winnt"], &["advapi32", "credui"]),
("wincrypt", &["basetsd", "bcrypt", "guiddef", "minwinbase", "minwindef", "ncrypt", "vcruntime", "winnt"], &["advapi32", "crypt32", "cryptnet"]),
("windowsceip", &["minwindef"], &["kernel32"]),
("winefs", &["basetsd", "minwinbase", "minwindef", "wincrypt", "winnt"], &["advapi32"]),
("winevt", &["basetsd", "guiddef", "minwinbase", "minwindef", "vcruntime", "winnt"], &["wevtapi"]),
("wingdi", &["basetsd", "minwindef", "windef", "winnt"], &["gdi32", "msimg32", "opengl32", "winspool"]),
("winhttp", &["basetsd", "minwinbase", "minwindef", "winnt"], &["winhttp"]),
Expand All @@ -281,6 +294,7 @@ const DATA: &'static [(&'static str, &'static [&'static str], &'static [&'static
("winnls", &["basetsd", "guiddef", "minwinbase", "minwindef", "winnt"], &["kernel32"]),
("winnt", &["basetsd", "excpt", "guiddef", "ktmtypes", "minwindef", "vcruntime"], &["kernel32"]),
("winreg", &["basetsd", "minwinbase", "minwindef", "winnt"], &["advapi32"]),
("winsafer", &["basetsd", "guiddef", "minwindef", "wincrypt", "windef", "winnt"], &["advapi32"]),
("winscard", &["basetsd", "guiddef", "minwindef", "rpcdce", "windef", "winnt", "winsmcrd"], &["winscard"]),
("winsmcrd", &["minwindef", "winioctl"], &[]),
("winsock2", &["basetsd", "guiddef", "inaddr", "minwinbase", "minwindef", "qos", "winbase", "windef", "winerror", "winnt", "ws2def", "wtypesbase"], &["ws2_32"]),
Expand Down
Loading

0 comments on commit 4a69b4a

Please sign in to comment.