Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
4c7a6694
Commit
4c7a6694
authored
16 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
include: Change unsigned long to ULONG in rpcdce.h for Win64 compatibility.
Also fix the compiler warnings introduced by this change.
parent
e86eb8ef
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/rpcrt4/rpc_binding.c
+7
-7
7 additions, 7 deletions
dlls/rpcrt4/rpc_binding.c
dlls/rpcrt4/rpc_server.c
+2
-2
2 additions, 2 deletions
dlls/rpcrt4/rpc_server.c
include/rpcdce.h
+36
-36
36 additions, 36 deletions
include/rpcdce.h
with
45 additions
and
45 deletions
dlls/rpcrt4/rpc_binding.c
+
7
−
7
View file @
4c7a6694
...
...
@@ -1372,7 +1372,7 @@ BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQuali
if
(
!
qos1
||
!
qos2
)
return
FALSE
;
TRACE
(
"qos1 = { %
l
d %
l
d %
l
d %
l
d }, qos2 = { %
l
d %
l
d %
l
d %
l
d }
\n
"
,
TRACE
(
"qos1 = { %d %d %d %d }, qos2 = { %d %d %d %d }
\n
"
,
qos1
->
qos
->
Capabilities
,
qos1
->
qos
->
IdentityTracking
,
qos1
->
qos
->
ImpersonationType
,
qos1
->
qos
->
AdditionalSecurityInfoType
,
qos2
->
qos
->
Capabilities
,
qos2
->
qos
->
IdentityTracking
,
...
...
@@ -1517,14 +1517,14 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName,
{
RPC_STATUS
status
;
TRACE
(
"SecurityQos { Version=%
l
d, Capabilties=0x%
l
x, IdentityTracking=%
l
d, ImpersonationLevel=%
l
d"
,
TRACE
(
"SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d"
,
SecurityQos
->
Version
,
SecurityQos
->
Capabilities
,
SecurityQos
->
IdentityTracking
,
SecurityQos
->
ImpersonationType
);
if
(
SecurityQos
->
Version
>=
2
)
{
const
RPC_SECURITY_QOS_V2_A
*
SecurityQos2
=
(
const
RPC_SECURITY_QOS_V2_A
*
)
SecurityQos
;
TRACE
(
", AdditionalSecurityInfoType=%
l
d"
,
SecurityQos2
->
AdditionalSecurityInfoType
);
TRACE
(
", AdditionalSecurityInfoType=%d"
,
SecurityQos2
->
AdditionalSecurityInfoType
);
if
(
SecurityQos2
->
AdditionalSecurityInfoType
==
RPC_C_AUTHN_INFO_TYPE_HTTP
)
TRACE
(
", { %p, 0x%
l
x, %
l
d, %
l
d, %p, %s }"
,
TRACE
(
", { %p, 0x%x, %d, %d, %p, %s }"
,
SecurityQos2
->
u
.
HttpCredentials
->
TransportCredentials
,
SecurityQos2
->
u
.
HttpCredentials
->
Flags
,
SecurityQos2
->
u
.
HttpCredentials
->
AuthenticationTarget
,
...
...
@@ -1647,14 +1647,14 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName,
{
RPC_STATUS
status
;
TRACE
(
"SecurityQos { Version=%
l
d, Capabilties=0x%
l
x, IdentityTracking=%
l
d, ImpersonationLevel=%
l
d"
,
TRACE
(
"SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d"
,
SecurityQos
->
Version
,
SecurityQos
->
Capabilities
,
SecurityQos
->
IdentityTracking
,
SecurityQos
->
ImpersonationType
);
if
(
SecurityQos
->
Version
>=
2
)
{
const
RPC_SECURITY_QOS_V2_W
*
SecurityQos2
=
(
const
RPC_SECURITY_QOS_V2_W
*
)
SecurityQos
;
TRACE
(
", AdditionalSecurityInfoType=%
l
d"
,
SecurityQos2
->
AdditionalSecurityInfoType
);
TRACE
(
", AdditionalSecurityInfoType=%d"
,
SecurityQos2
->
AdditionalSecurityInfoType
);
if
(
SecurityQos2
->
AdditionalSecurityInfoType
==
RPC_C_AUTHN_INFO_TYPE_HTTP
)
TRACE
(
", { %p, 0x%
l
x, %
l
d, %
l
d, %p, %s }"
,
TRACE
(
", { %p, 0x%x, %d, %d, %p, %s }"
,
SecurityQos2
->
u
.
HttpCredentials
->
TransportCredentials
,
SecurityQos2
->
u
.
HttpCredentials
->
Flags
,
SecurityQos2
->
u
.
HttpCredentials
->
AuthenticationTarget
,
...
...
This diff is collapsed.
Click to expand it.
dlls/rpcrt4/rpc_server.c
+
2
−
2
View file @
4c7a6694
...
...
@@ -745,7 +745,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC
RpcServerProtseq
*
ps
;
RPC_STATUS
status
;
TRACE
(
"(%s,%u,%s,%p,{%u,%
l
u,%
l
u})
\n
"
,
debugstr_a
(
szps
),
MaxCalls
,
TRACE
(
"(%s,%u,%s,%p,{%u,%u,%u})
\n
"
,
debugstr_a
(
szps
),
MaxCalls
,
debugstr_a
(
szep
),
SecurityDescriptor
,
lpPolicy
->
Length
,
lpPolicy
->
EndpointFlags
,
lpPolicy
->
NICFlags
);
...
...
@@ -766,7 +766,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC
RPC_STATUS
status
;
LPSTR
EndpointA
;
TRACE
(
"(%s,%u,%s,%p,{%u,%
l
u,%
l
u})
\n
"
,
debugstr_w
(
Protseq
),
MaxCalls
,
TRACE
(
"(%s,%u,%s,%p,{%u,%u,%u})
\n
"
,
debugstr_w
(
Protseq
),
MaxCalls
,
debugstr_w
(
Endpoint
),
SecurityDescriptor
,
lpPolicy
->
Length
,
lpPolicy
->
EndpointFlags
,
lpPolicy
->
NICFlags
);
...
...
This diff is collapsed.
Click to expand it.
include/rpcdce.h
+
36
−
36
View file @
4c7a6694
...
...
@@ -54,14 +54,14 @@ typedef RPC_BINDING_HANDLE handle_t;
typedef
struct
_RPC_BINDING_VECTOR
{
unsigned
long
Count
;
ULONG
Count
;
RPC_BINDING_HANDLE
BindingH
[
1
];
}
RPC_BINDING_VECTOR
;
#define rpc_binding_vector_t RPC_BINDING_VECTOR
typedef
struct
_UUID_VECTOR
{
unsigned
long
Count
;
ULONG
Count
;
UUID
*
Uuid
[
1
];
}
UUID_VECTOR
;
#define uuid_vector_t UUID_VECTOR
...
...
@@ -75,14 +75,14 @@ typedef struct _RPC_IF_ID
typedef
struct
{
unsigned
long
Count
;
ULONG
Count
;
RPC_IF_ID
*
IfId
[
1
];
}
RPC_IF_ID_VECTOR
;
typedef
struct
{
unsigned
int
Count
;
unsigned
long
Stats
[
1
];
ULONG
Stats
[
1
];
}
RPC_STATS_VECTOR
;
typedef
I_RPC_HANDLE
*
RPC_EP_INQ_HANDLE
;
...
...
@@ -195,66 +195,66 @@ typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)();
typedef
struct
_RPC_POLICY
{
unsigned
int
Length
;
unsigned
long
EndpointFlags
;
unsigned
long
NICFlags
;
ULONG
EndpointFlags
;
ULONG
NICFlags
;
}
RPC_POLICY
,
*
PRPC_POLICY
;
typedef
struct
_SEC_WINNT_AUTH_IDENTITY_W
{
unsigned
short
*
User
;
unsigned
long
UserLength
;
ULONG
UserLength
;
unsigned
short
*
Domain
;
unsigned
long
DomainLength
;
ULONG
DomainLength
;
unsigned
short
*
Password
;
unsigned
long
PasswordLength
;
unsigned
long
Flags
;
ULONG
PasswordLength
;
ULONG
Flags
;
}
SEC_WINNT_AUTH_IDENTITY_W
,
*
PSEC_WINNT_AUTH_IDENTITY_W
;
typedef
struct
_SEC_WINNT_AUTH_IDENTITY_A
{
unsigned
char
*
User
;
unsigned
long
UserLength
;
ULONG
UserLength
;
unsigned
char
*
Domain
;
unsigned
long
DomainLength
;
ULONG
DomainLength
;
unsigned
char
*
Password
;
unsigned
long
PasswordLength
;
unsigned
long
Flags
;
ULONG
PasswordLength
;
ULONG
Flags
;
}
SEC_WINNT_AUTH_IDENTITY_A
,
*
PSEC_WINNT_AUTH_IDENTITY_A
;
typedef
struct
_RPC_HTTP_TRANSPORT_CREDENTIALS_W
{
SEC_WINNT_AUTH_IDENTITY_W
*
TransportCredentials
;
unsigned
long
Flags
;
unsigned
long
AuthenticationTarget
;
unsigned
long
NumberOfAuthnSchemes
;
unsigned
long
*
AuthnSchemes
;
ULONG
Flags
;
ULONG
AuthenticationTarget
;
ULONG
NumberOfAuthnSchemes
;
ULONG
*
AuthnSchemes
;
unsigned
short
*
ServerCertificateSubject
;
}
RPC_HTTP_TRANSPORT_CREDENTIALS_W
,
*
PRPC_HTTP_TRANSPORT_CREDENTIALS_W
;
typedef
struct
_RPC_HTTP_TRANSPORT_CREDENTIALS_A
{
SEC_WINNT_AUTH_IDENTITY_A
*
TransportCredentials
;
unsigned
long
Flags
;
unsigned
long
AuthenticationTarget
;
unsigned
long
NumberOfAuthnSchemes
;
unsigned
long
*
AuthnSchemes
;
ULONG
Flags
;
ULONG
AuthenticationTarget
;
ULONG
NumberOfAuthnSchemes
;
ULONG
*
AuthnSchemes
;
unsigned
char
*
ServerCertificateSubject
;
}
RPC_HTTP_TRANSPORT_CREDENTIALS_A
,
*
PRPC_HTTP_TRANSPORT_CREDENTIALS_A
;
typedef
struct
_RPC_SECURITY_QOS
{
unsigned
long
Version
;
unsigned
long
Capabilities
;
unsigned
long
IdentityTracking
;
unsigned
long
ImpersonationType
;
ULONG
Version
;
ULONG
Capabilities
;
ULONG
IdentityTracking
;
ULONG
ImpersonationType
;
}
RPC_SECURITY_QOS
,
*
PRPC_SECURITY_QOS
;
typedef
struct
_RPC_SECURITY_QOS_V2_W
{
unsigned
long
Version
;
unsigned
long
Capabilities
;
unsigned
long
IdentityTracking
;
unsigned
long
ImpersonationType
;
unsigned
long
AdditionalSecurityInfoType
;
ULONG
Version
;
ULONG
Capabilities
;
ULONG
IdentityTracking
;
ULONG
ImpersonationType
;
ULONG
AdditionalSecurityInfoType
;
union
{
RPC_HTTP_TRANSPORT_CREDENTIALS_W
*
HttpCredentials
;
...
...
@@ -263,11 +263,11 @@ typedef struct _RPC_SECURITY_QOS_V2_W
typedef
struct
_RPC_SECURITY_QOS_V2_A
{
unsigned
long
Version
;
unsigned
long
Capabilities
;
unsigned
long
IdentityTracking
;
unsigned
long
ImpersonationType
;
unsigned
long
AdditionalSecurityInfoType
;
ULONG
Version
;
ULONG
Capabilities
;
ULONG
IdentityTracking
;
ULONG
ImpersonationType
;
ULONG
AdditionalSecurityInfoType
;
union
{
RPC_HTTP_TRANSPORT_CREDENTIALS_A
*
HttpCredentials
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment