Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
644cd0ae
Commit
644cd0ae
authored
Dec 12, 2011
by
Francois Gouget
Committed by
Alexandre Julliard
Dec 13, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Add a missing wincrypt.h include directive to mprapi.h.
Also add the USE_WC_PREFIX macro so one can cleanly deal with the CMSG_DATA conflict with sys/socket.h.
parent
302aad9c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
0 deletions
+18
-0
socket.c
dlls/ws2_32/socket.c
+1
-0
mprapi.h
include/mprapi.h
+1
-0
wincrypt.h
include/wincrypt.h
+16
-0
No files found.
dlls/ws2_32/socket.c
View file @
644cd0ae
...
...
@@ -146,6 +146,7 @@
#include "mstcpip.h"
#include "af_irda.h"
#include "winnt.h"
#define USE_WC_PREFIX
/* For CMSG_DATA */
#include "iphlpapi.h"
#include "wine/server.h"
#include "wine/debug.h"
...
...
include/mprapi.h
View file @
644cd0ae
...
...
@@ -22,6 +22,7 @@
#include <lmcons.h>
#include <ras.h>
#include <in6addr.h>
#include <wincrypt.h>
#define MAX_DEVICE_NAME 128
#define MAX_DEVICETYPE_NAME 16
...
...
include/wincrypt.h
View file @
644cd0ae
...
...
@@ -3432,6 +3432,7 @@ typedef struct _CERT_ID
#define CERT_ID_KEY_IDENTIFIER 2
#define CERT_ID_SHA1_HASH 3
#ifndef USE_WC_PREFIX
#undef CMSG_DATA
/* may be defined by sys/socket.h */
#define CMSG_DATA 1
#define CMSG_SIGNED 2
...
...
@@ -3446,6 +3447,21 @@ typedef struct _CERT_ID
#define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED)
#define CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << CMSG_SIGNED_AND_ENVELOPED)
#define CMSG_ENCRYPTED_FLAG (1 << CMSG_ENCRYPTED)
#else
#define WC_CMSG_DATA 1
#define WC_CMSG_SIGNED 2
#define WC_CMSG_ENVELOPED 3
#define WC_CMSG_SIGNED_AND_ENVELOPED 4
#define WC_CMSG_HASHED 5
#define WC_CMSG_ENCRYPTED 6
#define WC_CMSG_ALL_FLAGS ~0U
#define WC_CMSG_DATA_FLAG (1 << WC_CMSG_DATA)
#define WC_CMSG_SIGNED_FLAG (1 << WC_CMSG_SIGNED)
#define WC_CMSG_ENVELOPED_FLAG (1 << WC_CMSG_ENVELOPED)
#define WC_CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << WC_CMSG_SIGNED_AND_ENVELOPED)
#define WC_CMSG_ENCRYPTED_FLAG (1 << WC_CMSG_ENCRYPTED)
#endif
typedef
struct
_CMSG_SIGNER_ENCODE_INFO
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment