From 5363f350887b1e5b5dd21a86f88c8af9d7fea6da Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:18:25 +0200
Subject: Merging upstream version 1.67.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../Win32/NetworkManagement/NetShell/mod.rs        | 213 +++++++++++----------
 1 file changed, 108 insertions(+), 105 deletions(-)

(limited to 'vendor/windows-sys/src/Windows/Win32/NetworkManagement/NetShell/mod.rs')

diff --git a/vendor/windows-sys/src/Windows/Win32/NetworkManagement/NetShell/mod.rs b/vendor/windows-sys/src/Windows/Win32/NetworkManagement/NetShell/mod.rs
index ce78d1282..dce979375 100644
--- a/vendor/windows-sys/src/Windows/Win32/NetworkManagement/NetShell/mod.rs
+++ b/vendor/windows-sys/src/Windows/Win32/NetworkManagement/NetShell/mod.rs
@@ -1,66 +1,31 @@
-#[link(name = "windows")]
-extern "system" {
+#[cfg_attr(windows, link(name = "windows"))]
+extern "cdecl" {
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn MatchEnumTag(hmodule: super::super::Foundation::HANDLE, pwcarg: ::windows_sys::core::PCWSTR, dwnumarg: u32, penumtable: *const TOKEN_VALUE, pdwvalue: *mut u32) -> u32;
+    pub fn PrintError(hmodule: super::super::Foundation::HANDLE, dwerrid: u32) -> u32;
+    #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+    pub fn PrintMessage(pwszformat: ::windows_sys::core::PCWSTR) -> u32;
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn MatchToken(pwszusertoken: ::windows_sys::core::PCWSTR, pwszcmdtoken: ::windows_sys::core::PCWSTR) -> super::super::Foundation::BOOL;
+    pub fn PrintMessageFromModule(hmodule: super::super::Foundation::HANDLE, dwmsgid: u32) -> u32;
+}
+#[cfg_attr(windows, link(name = "windows"))]
+extern "system" {
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn PreprocessCommand(hmodule: super::super::Foundation::HANDLE, ppwcarguments: *mut ::windows_sys::core::PWSTR, dwcurrentindex: u32, dwargcount: u32, ptttags: *mut TAG_TYPE, dwtagcount: u32, dwminargs: u32, dwmaxargs: u32, pdwtagtype: *mut u32) -> u32;
+    pub fn MatchEnumTag(hmodule: super::super::Foundation::HANDLE, pwcarg: ::windows_sys::core::PCWSTR, dwnumarg: u32, penumtable: *const TOKEN_VALUE, pdwvalue: *mut u32) -> u32;
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn PrintError(hmodule: super::super::Foundation::HANDLE, dwerrid: u32) -> u32;
-    #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-    pub fn PrintMessage(pwszformat: ::windows_sys::core::PCWSTR) -> u32;
+    pub fn MatchToken(pwszusertoken: ::windows_sys::core::PCWSTR, pwszcmdtoken: ::windows_sys::core::PCWSTR) -> super::super::Foundation::BOOL;
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn PrintMessageFromModule(hmodule: super::super::Foundation::HANDLE, dwmsgid: u32) -> u32;
+    pub fn PreprocessCommand(hmodule: super::super::Foundation::HANDLE, ppwcarguments: *mut ::windows_sys::core::PWSTR, dwcurrentindex: u32, dwargcount: u32, ptttags: *mut TAG_TYPE, dwtagcount: u32, dwminargs: u32, dwmaxargs: u32, pdwtagtype: *mut u32) -> u32;
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
     pub fn RegisterContext(pchildcontext: *const NS_CONTEXT_ATTRIBUTES) -> u32;
     #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
     pub fn RegisterHelper(pguidparentcontext: *const ::windows_sys::core::GUID, pfnregistersubcontext: *const NS_HELPER_ATTRIBUTES) -> u32;
 }
-#[repr(C)]
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
-#[cfg(feature = "Win32_Foundation")]
-pub struct CMD_ENTRY {
-    pub pwszCmdToken: ::windows_sys::core::PCWSTR,
-    pub pfnCmdHandler: PFN_HANDLE_CMD,
-    pub dwShortCmdHelpToken: u32,
-    pub dwCmdHlpToken: u32,
-    pub dwFlags: u32,
-    pub pOsVersionCheck: PNS_OSVERSIONCHECK,
-}
-#[cfg(feature = "Win32_Foundation")]
-impl ::core::marker::Copy for CMD_ENTRY {}
-#[cfg(feature = "Win32_Foundation")]
-impl ::core::clone::Clone for CMD_ENTRY {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[repr(C)]
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
-#[cfg(feature = "Win32_Foundation")]
-pub struct CMD_GROUP_ENTRY {
-    pub pwszCmdGroupToken: ::windows_sys::core::PCWSTR,
-    pub dwShortCmdHelpToken: u32,
-    pub ulCmdGroupSize: u32,
-    pub dwFlags: u32,
-    pub pCmdGroup: *mut CMD_ENTRY,
-    pub pOsVersionCheck: PNS_OSVERSIONCHECK,
-}
-#[cfg(feature = "Win32_Foundation")]
-impl ::core::marker::Copy for CMD_GROUP_ENTRY {}
-#[cfg(feature = "Win32_Foundation")]
-impl ::core::clone::Clone for CMD_GROUP_ENTRY {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub const DEFAULT_CONTEXT_PRIORITY: u32 = 100u32;
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
@@ -124,6 +89,8 @@ pub const NETSH_MAX_TOKEN_LENGTH: u32 = 64u32;
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub const NETSH_VERSION_50: u32 = 20480u32;
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_GET_EVENT_IDS_FN_NAME: &str = "GetEventIds";
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub type NS_CMD_FLAGS = i32;
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub const CMD_FLAG_PRIVATE: NS_CMD_FLAGS = 1i32;
@@ -139,6 +106,78 @@ pub const CMD_FLAG_HIDDEN: NS_CMD_FLAGS = 32i32;
 pub const CMD_FLAG_LIMIT_MASK: NS_CMD_FLAGS = 65535i32;
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub const CMD_FLAG_PRIORITY: NS_CMD_FLAGS = -2147483648i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type NS_EVENTS = i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_EVENT_LOOP: NS_EVENTS = 65536i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_EVENT_LAST_N: NS_EVENTS = 1i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_EVENT_LAST_SECS: NS_EVENTS = 2i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_EVENT_FROM_N: NS_EVENTS = 4i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_EVENT_FROM_START: NS_EVENTS = 8i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type NS_MODE_CHANGE = i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NETSH_COMMIT: NS_MODE_CHANGE = 0i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NETSH_UNCOMMIT: NS_MODE_CHANGE = 1i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NETSH_FLUSH: NS_MODE_CHANGE = 2i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NETSH_COMMIT_STATE: NS_MODE_CHANGE = 3i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NETSH_SAVE: NS_MODE_CHANGE = 4i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type NS_REQS = i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_REQ_ZERO: NS_REQS = 0i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_REQ_PRESENT: NS_REQS = 1i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_REQ_ALLOW_MULTIPLE: NS_REQS = 2i32;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub const NS_REQ_ONE_OR_MORE: NS_REQS = 3i32;
+#[repr(C)]
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
+#[cfg(feature = "Win32_Foundation")]
+pub struct CMD_ENTRY {
+    pub pwszCmdToken: ::windows_sys::core::PCWSTR,
+    pub pfnCmdHandler: PFN_HANDLE_CMD,
+    pub dwShortCmdHelpToken: u32,
+    pub dwCmdHlpToken: u32,
+    pub dwFlags: u32,
+    pub pOsVersionCheck: PNS_OSVERSIONCHECK,
+}
+#[cfg(feature = "Win32_Foundation")]
+impl ::core::marker::Copy for CMD_ENTRY {}
+#[cfg(feature = "Win32_Foundation")]
+impl ::core::clone::Clone for CMD_ENTRY {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+#[repr(C)]
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
+#[cfg(feature = "Win32_Foundation")]
+pub struct CMD_GROUP_ENTRY {
+    pub pwszCmdGroupToken: ::windows_sys::core::PCWSTR,
+    pub dwShortCmdHelpToken: u32,
+    pub ulCmdGroupSize: u32,
+    pub dwFlags: u32,
+    pub pCmdGroup: *mut CMD_ENTRY,
+    pub pOsVersionCheck: PNS_OSVERSIONCHECK,
+}
+#[cfg(feature = "Win32_Foundation")]
+impl ::core::marker::Copy for CMD_GROUP_ENTRY {}
+#[cfg(feature = "Win32_Foundation")]
+impl ::core::clone::Clone for CMD_GROUP_ENTRY {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
 #[repr(C)]
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
 #[cfg(feature = "Win32_Foundation")]
@@ -196,20 +235,6 @@ impl ::core::clone::Clone for NS_CONTEXT_ATTRIBUTES_0_0 {
         *self
     }
 }
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type NS_EVENTS = i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_EVENT_LOOP: NS_EVENTS = 65536i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_EVENT_LAST_N: NS_EVENTS = 1i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_EVENT_LAST_SECS: NS_EVENTS = 2i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_EVENT_FROM_N: NS_EVENTS = 4i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_EVENT_FROM_START: NS_EVENTS = 8i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_GET_EVENT_IDS_FN_NAME: &str = "GetEventIds";
 #[repr(C)]
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
 pub struct NS_HELPER_ATTRIBUTES {
@@ -248,50 +273,6 @@ impl ::core::clone::Clone for NS_HELPER_ATTRIBUTES_0_0 {
         *self
     }
 }
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type NS_MODE_CHANGE = i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NETSH_COMMIT: NS_MODE_CHANGE = 0i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NETSH_UNCOMMIT: NS_MODE_CHANGE = 1i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NETSH_FLUSH: NS_MODE_CHANGE = 2i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NETSH_COMMIT_STATE: NS_MODE_CHANGE = 3i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NETSH_SAVE: NS_MODE_CHANGE = 4i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type NS_REQS = i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_REQ_ZERO: NS_REQS = 0i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_REQ_PRESENT: NS_REQS = 1i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_REQ_ALLOW_MULTIPLE: NS_REQS = 2i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub const NS_REQ_ONE_OR_MORE: NS_REQS = 3i32;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
-#[cfg(feature = "Win32_Foundation")]
-pub type PFN_HANDLE_CMD = ::core::option::Option<unsafe extern "system" fn(pwszmachine: ::windows_sys::core::PCWSTR, ppwcarguments: *mut ::windows_sys::core::PWSTR, dwcurrentindex: u32, dwargcount: u32, dwflags: u32, pvdata: *const ::core::ffi::c_void, pbdone: *mut super::super::Foundation::BOOL) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PGET_RESOURCE_STRING_FN = ::core::option::Option<unsafe extern "system" fn(dwmsgid: u32, lpbuffer: ::windows_sys::core::PCWSTR, nbuffermax: u32) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_CONTEXT_COMMIT_FN = ::core::option::Option<unsafe extern "system" fn(dwaction: u32) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_CONTEXT_CONNECT_FN = ::core::option::Option<unsafe extern "system" fn(pwszmachine: ::windows_sys::core::PCWSTR) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_CONTEXT_DUMP_FN = ::core::option::Option<unsafe extern "system" fn(pwszrouter: ::windows_sys::core::PCWSTR, ppwcarguments: *const ::windows_sys::core::PWSTR, dwargcount: u32, pvdata: *const ::core::ffi::c_void) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_DLL_INIT_FN = ::core::option::Option<unsafe extern "system" fn(dwnetshversion: u32, preserved: *mut ::core::ffi::c_void) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_DLL_STOP_FN = ::core::option::Option<unsafe extern "system" fn(dwreserved: u32) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_HELPER_START_FN = ::core::option::Option<unsafe extern "system" fn(pguidparent: *const ::windows_sys::core::GUID, dwversion: u32) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
-pub type PNS_HELPER_STOP_FN = ::core::option::Option<unsafe extern "system" fn(dwreserved: u32) -> u32>;
-#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
-#[cfg(feature = "Win32_Foundation")]
-pub type PNS_OSVERSIONCHECK = ::core::option::Option<unsafe extern "system" fn(cimostype: u32, cimosproductsuite: u32, cimosversion: ::windows_sys::core::PCWSTR, cimosbuildnumber: ::windows_sys::core::PCWSTR, cimservicepackmajorversion: ::windows_sys::core::PCWSTR, cimservicepackminorversion: ::windows_sys::core::PCWSTR, uireserved: u32, dwreserved: u32) -> super::super::Foundation::BOOL>;
 #[repr(C)]
 #[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
 #[cfg(feature = "Win32_Foundation")]
@@ -320,3 +301,25 @@ impl ::core::clone::Clone for TOKEN_VALUE {
         *self
     }
 }
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
+#[cfg(feature = "Win32_Foundation")]
+pub type PFN_HANDLE_CMD = ::core::option::Option<unsafe extern "system" fn(pwszmachine: ::windows_sys::core::PCWSTR, ppwcarguments: *mut ::windows_sys::core::PWSTR, dwcurrentindex: u32, dwargcount: u32, dwflags: u32, pvdata: *const ::core::ffi::c_void, pbdone: *mut super::super::Foundation::BOOL) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PGET_RESOURCE_STRING_FN = ::core::option::Option<unsafe extern "system" fn(dwmsgid: u32, lpbuffer: ::windows_sys::core::PCWSTR, nbuffermax: u32) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_CONTEXT_COMMIT_FN = ::core::option::Option<unsafe extern "system" fn(dwaction: u32) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_CONTEXT_CONNECT_FN = ::core::option::Option<unsafe extern "system" fn(pwszmachine: ::windows_sys::core::PCWSTR) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_CONTEXT_DUMP_FN = ::core::option::Option<unsafe extern "system" fn(pwszrouter: ::windows_sys::core::PCWSTR, ppwcarguments: *const ::windows_sys::core::PWSTR, dwargcount: u32, pvdata: *const ::core::ffi::c_void) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_DLL_INIT_FN = ::core::option::Option<unsafe extern "system" fn(dwnetshversion: u32, preserved: *mut ::core::ffi::c_void) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_DLL_STOP_FN = ::core::option::Option<unsafe extern "system" fn(dwreserved: u32) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_HELPER_START_FN = ::core::option::Option<unsafe extern "system" fn(pguidparent: *const ::windows_sys::core::GUID, dwversion: u32) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`*"]
+pub type PNS_HELPER_STOP_FN = ::core::option::Option<unsafe extern "system" fn(dwreserved: u32) -> u32>;
+#[doc = "*Required features: `\"Win32_NetworkManagement_NetShell\"`, `\"Win32_Foundation\"`*"]
+#[cfg(feature = "Win32_Foundation")]
+pub type PNS_OSVERSIONCHECK = ::core::option::Option<unsafe extern "system" fn(cimostype: u32, cimosproductsuite: u32, cimosversion: ::windows_sys::core::PCWSTR, cimosbuildnumber: ::windows_sys::core::PCWSTR, cimservicepackmajorversion: ::windows_sys::core::PCWSTR, cimservicepackminorversion: ::windows_sys::core::PCWSTR, uireserved: u32, dwreserved: u32) -> super::super::Foundation::BOOL>;
-- 
cgit v1.2.3