Merging upstream version 1.67.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 64 insertions, 64 deletions

diff --git a/vendor/windows-sys/src/Windows/Win32/System/ParentalControls/mod.rs b/vendor/windows-sys/src/Windows/Win32/System/ParentalControls/mod.rs
index 1fde5c5ee..52c4ee5c3 100644
--- a/vendor/windows-sys/src/Windows/Win32/System/ParentalControls/mod.rs
+++ b/vendor/windows-sys/src/Windows/Win32/System/ParentalControls/mod.rs
@@ -1,7 +1,3 @@
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const ARRAY_SEP_CHAR: u32 = 9u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const FACILITY_WPC: u32 = 2457u32;
 pub type IWPCGamesSettings = *mut ::core::ffi::c_void;
 pub type IWPCProviderConfig = *mut ::core::ffi::c_void;
 pub type IWPCProviderState = *mut ::core::ffi::c_void;
@@ -11,6 +7,10 @@ pub type IWPCWebSettings = *mut ::core::ffi::c_void;
 pub type IWindowsParentalControls = *mut ::core::ffi::c_void;
 pub type IWindowsParentalControlsCore = *mut ::core::ffi::c_void;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const ARRAY_SEP_CHAR: u32 = 9u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const FACILITY_WPC: u32 = 2457u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub const MSG_Event_AppBlocked: i32 = -1342177264i32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub const MSG_Event_AppOverride: i32 = -1342177263i32;
@@ -154,6 +154,66 @@ pub const WPCEVENT_WEB_FILEDOWNLOAD_value: u32 = 10u32;
 pub const WPCEVENT_WEB_URLVISIT_value: u32 = 3u32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub const WPCEVENT_WEB_WEBSITEVISIT_value: u32 = 19u32;
+pub const WPCPROV: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 17367141, data2: 46183, data3: 17667, data4: [155, 40, 83, 55, 102, 118, 16, 135] };
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_KEYWORD_ThirdParty: u32 = 32u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_KEYWORD_WPC: u32 = 16u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_AppBlocked: u32 = 16u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_AppOverride: u32 = 17u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_Application: u32 = 20u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_ComputerUsage: u32 = 21u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_ContentUsage: u32 = 22u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_Custom: u32 = 13u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_EmailContact: u32 = 14u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_EmailReceived: u32 = 4u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_EmailSent: u32 = 5u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_FileDownload: u32 = 10u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_GameStart: u32 = 2u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_IMContact: u32 = 15u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_IMFeature: u32 = 11u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_IMInvitation: u32 = 7u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_IMJoin: u32 = 8u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_IMLeave: u32 = 9u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_MediaPlayback: u32 = 6u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_SettingChange: u32 = 1u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_UrlVisit: u32 = 3u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_WebOverride: u32 = 18u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPCPROV_TASK_WebsiteVisit: u32 = 19u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPC_APP_LAUNCH: u32 = 22u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPC_SETTINGS_LOCATE: u32 = 20u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPC_SETTINGS_MODIFY: u32 = 21u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPC_SYSTEM: u32 = 23u32;
+#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
+pub const WPC_WEB: u32 = 24u32;
+pub const WindowsParentalControls: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3883714715, data2: 29697, data3: 19460, data4: [140, 237, 20, 157, 179, 90, 221, 4] };
+pub const WpcProviderSupport: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3138963360, data2: 8582, data3: 19424, data4: [151, 216, 4, 132, 123, 98, 142, 2] };
+pub const WpcSettingsProvider: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 895352746, data2: 15263, data3: 17244, data4: [180, 40, 93, 68, 41, 11, 197, 242] };
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub type WPCFLAG_IM_FEATURE = i32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
@@ -284,55 +344,6 @@ pub type WPCFLAG_WEB_SETTING = i32;
 pub const WPCFLAG_WEB_SETTING_NOTBLOCKED: WPCFLAG_WEB_SETTING = 0i32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub const WPCFLAG_WEB_SETTING_DOWNLOADSBLOCKED: WPCFLAG_WEB_SETTING = 1i32;
-pub const WPCPROV: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 17367141, data2: 46183, data3: 17667, data4: [155, 40, 83, 55, 102, 118, 16, 135] };
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_KEYWORD_ThirdParty: u32 = 32u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_KEYWORD_WPC: u32 = 16u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_AppBlocked: u32 = 16u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_AppOverride: u32 = 17u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_Application: u32 = 20u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_ComputerUsage: u32 = 21u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_ContentUsage: u32 = 22u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_Custom: u32 = 13u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_EmailContact: u32 = 14u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_EmailReceived: u32 = 4u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_EmailSent: u32 = 5u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_FileDownload: u32 = 10u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_GameStart: u32 = 2u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_IMContact: u32 = 15u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_IMFeature: u32 = 11u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_IMInvitation: u32 = 7u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_IMJoin: u32 = 8u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_IMLeave: u32 = 9u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_MediaPlayback: u32 = 6u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_SettingChange: u32 = 1u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_UrlVisit: u32 = 3u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_WebOverride: u32 = 18u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPCPROV_TASK_WebsiteVisit: u32 = 19u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPC_APP_LAUNCH: u32 = 22u32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub type WPC_ARGS_APPLICATIONEVENT = i32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
@@ -857,14 +868,3 @@ pub const WPC_SETTINGS_USER_TIME_ALLOWANCE_RESTRICTIONS: WPC_SETTINGS = 35i32;
 pub const WPC_SETTINGS_GAME_RESTRICTED: WPC_SETTINGS = 36i32;
 #[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
 pub const WPC_SETTING_COUNT: WPC_SETTINGS = 37i32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPC_SETTINGS_LOCATE: u32 = 20u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPC_SETTINGS_MODIFY: u32 = 21u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPC_SYSTEM: u32 = 23u32;
-#[doc = "*Required features: `\"Win32_System_ParentalControls\"`*"]
-pub const WPC_WEB: u32 = 24u32;
-pub const WindowsParentalControls: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3883714715, data2: 29697, data3: 19460, data4: [140, 237, 20, 157, 179, 90, 221, 4] };
-pub const WpcProviderSupport: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3138963360, data2: 8582, data3: 19424, data4: [151, 216, 4, 132, 123, 98, 142, 2] };
-pub const WpcSettingsProvider: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 895352746, data2: 15263, data3: 17244, data4: [180, 40, 93, 68, 41, 11, 197, 242] };