[PATCH 0/2] MR7873: include: Change the schannel.h guard name.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7873

[PATCH 1/2] include: Change the schannel.h guard name.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 include/schannel.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/schannel.h b/include/schannel.h
index cbe1a131381..12d9b1e87de 100644
--- a/include/schannel.h
+++ b/include/schannel.h
@@ -15,8 +15,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#ifndef __WINE_SCHANNEL_H__
-#define __WINE_SCHANNEL_H__
+#ifndef __SCHANNEL_H__
+#define __SCHANNEL_H__
 
 #include <minschannel.h>
 #include <wincrypt.h>
@@ -343,4 +343,4 @@ typedef struct _SecPkgContext_CipherInfo
     DWORD dwKeyType;
 } SecPkgContext_CipherInfo, *PSecPkgContext_CipherInfo;
 
-#endif /* __WINE_SCHANNEL_H__ */
+#endif /* __SCHANNEL_H__ */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/7873

[PATCH 2/2] include: Add WINHTTP_SECURITY_INFO type.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 include/winhttp.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/winhttp.h b/include/winhttp.h
index cb54433cb1b..0158a9d1f40 100644
--- a/include/winhttp.h
+++ b/include/winhttp.h
@@ -862,6 +862,16 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS
 #define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH   123
 #define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE     15000
 
+#ifdef __SCHANNEL_H__
+
+typedef struct _WINHTTP_SECURITY_INFO
+{
+    SecPkgContext_ConnectionInfo ConnectionInfo;
+    SecPkgContext_CipherInfo CipherInfo;
+} WINHTTP_SECURITY_INFO, *PWINHTTP_SECURITY_INFO;
+
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7873