Mscat mssip (#344)

* Moved gl.rs to the correct folder and made the um-gl feature

* Added missing um/gl/mod.rs file

* Moved doc header comment in the right position.

That's what you get for changing things without testing them

* Added mscat and mssip.
mssip and mscat refer to each other, so for now mssip won't be referring to mscat. mscat still refers to mssip though.

* Revert "Moved gl.rs to the correct folder and made the um-gl feature"

This reverts commit 564de02.

* Not sure why I removed gl. I must just be a dumb-dumb

Cargo.toml

@@ -148,6 +148,8 @@ headers = ["headers-shared", "headers-um", "headers-vc", "headers-winrt"]
     "um-minwinbase",
     "um-mmdeviceapi",
     "um-mmsystem",
+    "um-mscat",
+    "um-mssip",
     "um-ncrypt",
     "um-oaidl",
     "um-objidlbase",
@@ -222,6 +224,8 @@ headers = ["headers-shared", "headers-um", "headers-vc", "headers-winrt"]
 "um-minwinbase" = ["shared-ntstatus"]
 "um-mmdeviceapi" = ["shared-guiddef", "shared-minwindef", "um-propidl", "um-propsys", "um-unknwnbase", "um-winnt"]
 "um-mmsystem" = ["shared-basetsd", "shared-minwindef", "shared-mmreg", "um-winnt"]
+"um-mscat" = ["shared-guiddef", "shared-minwindef", "um-mssip", "um-wincrypt", "um-winnt"]
+"um-mssip" = ["shared-guiddef", "shared-minwindef", "um-winnt", "um-wincrypt"]
 "um-ncrypt" = ["shared-basetsd", "shared-sspi", "ncrypt"]
 "um-oaidl" = ["shared-basetsd", "shared-guiddef", "shared-minwindef", "shared-wtypes", "shared-wtypesbase", "um-unknwnbase", "um-winnt"]
 "um-objidlbase" = ["shared-guiddef", "shared-minwindef", "shared-wtypesbase", "um-unknwnbase", "um-winnt"]

src/um/mod.rs

@@ -53,6 +53,8 @@ pub mod gl;
 #[cfg(feature = "um-minwinbase")] pub mod minwinbase;
 #[cfg(feature = "um-mmdeviceapi")] pub mod mmdeviceapi;
 #[cfg(feature = "um-mmsystem")] pub mod mmsystem;
+#[cfg(feature = "um-mscat")] pub mod mscat;
+#[cfg(feature = "um-mssip")] pub mod mssip;
 #[cfg(feature = "um-ncrypt")] pub mod ncrypt;
 #[cfg(feature = "um-oaidl")] pub mod oaidl;
 #[cfg(feature = "um-objidlbase")] pub mod objidlbase;

src/mscat.rs → src/um/mscat.rs

@@ -1,6 +1,13 @@
 // Copyright © 2015, skdltmxn
 // Licensed under the MIT License <LICENSE.md>
 //! Microsoft Internet Security Catalog API Prototypes and Definitions
+
+use shared::guiddef::GUID;
+use shared::minwindef::DWORD;
+use um::mssip::SIP_INDIRECT_DATA;
+use um::wincrypt::{HCRYPTMSG, HCRYPTPROV, CRYPT_ATTR_BLOB};
+use um::winnt::{HANDLE, LPWSTR};
+
 STRUCT!{struct CRYPTCATSTORE {
     cbStruct: DWORD,
     dwPublicVersion: DWORD,

src/mssip.rs → src/um/mssip.rs

@@ -1,6 +1,13 @@
 // Copyright © 2015, skdltmxn
 // Licensed under the MIT License <LICENSE.md>
 //! Microsoft SIP Provider Prototypes and Definitions
+
+use shared::guiddef::GUID;
+use shared::minwindef::{BOOL, BYTE, DWORD, LPVOID};
+use um::mscat::{CRYPTCATMEMBER, CRYPTCATSTORE};
+use um::winnt::{HANDLE, LPCWSTR, PWSTR, WCHAR};
+use um::wincrypt::{CRYPT_ALGORITHM_IDENTIFIER, CRYPT_ATTRIBUTE_TYPE_VALUE, CRYPT_HASH_BLOB, HCRYPTPROV};
+
 STRUCT!{struct SIP_SUBJECTINFO {
     cbSize: DWORD,
     pgSubjectType: *mut GUID,