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
9d625ad0
Commit
9d625ad0
authored
Nov 08, 2006
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Nov 09, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix the warnings introduced by the "unsigned long" to "ULONG" header changes.
parent
22befac9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
tmarshal.c
dlls/oleaut32/tmarshal.c
+3
-3
usrmarshal.c
dlls/oleaut32/usrmarshal.c
+13
-13
No files found.
dlls/oleaut32/tmarshal.c
View file @
9d625ad0
...
...
@@ -804,8 +804,8 @@ serialize_param(
case
VT_SAFEARRAY
:
{
if
(
writeit
)
{
unsigned
long
flags
=
MAKELONG
(
MSHCTX_DIFFERENTMACHINE
,
NDR_LOCAL_DATA_REPRESENTATION
);
unsigned
long
size
=
LPSAFEARRAY_UserSize
(
&
flags
,
buf
->
curoff
,
(
LPSAFEARRAY
*
)
arg
);
ULONG
flags
=
MAKELONG
(
MSHCTX_DIFFERENTMACHINE
,
NDR_LOCAL_DATA_REPRESENTATION
);
ULONG
size
=
LPSAFEARRAY_UserSize
(
&
flags
,
buf
->
curoff
,
(
LPSAFEARRAY
*
)
arg
);
xbuf_resize
(
buf
,
size
);
LPSAFEARRAY_UserMarshal
(
&
flags
,
buf
->
base
+
buf
->
curoff
,
(
LPSAFEARRAY
*
)
arg
);
buf
->
curoff
=
size
;
...
...
@@ -1149,7 +1149,7 @@ deserialize_param(
case
VT_SAFEARRAY
:
{
if
(
readit
)
{
unsigned
long
flags
=
MAKELONG
(
MSHCTX_DIFFERENTMACHINE
,
NDR_LOCAL_DATA_REPRESENTATION
);
ULONG
flags
=
MAKELONG
(
MSHCTX_DIFFERENTMACHINE
,
NDR_LOCAL_DATA_REPRESENTATION
);
unsigned
char
*
buffer
;
buffer
=
LPSAFEARRAY_UserUnmarshal
(
&
flags
,
buf
->
base
+
buf
->
curoff
,
(
LPSAFEARRAY
*
)
arg
);
buf
->
curoff
=
buffer
-
buf
->
base
;
...
...
dlls/oleaut32/usrmarshal.c
View file @
9d625ad0
...
...
@@ -144,11 +144,11 @@ typedef struct
ULONG
WINAPI
BSTR_UserSize
(
ULONG
*
pFlags
,
ULONG
Start
,
BSTR
*
pstr
)
{
TRACE
(
"(%
lx,%l
d,%p) => %p
\n
"
,
*
pFlags
,
Start
,
pstr
,
*
pstr
);
TRACE
(
"(%
x,%
d,%p) => %p
\n
"
,
*
pFlags
,
Start
,
pstr
,
*
pstr
);
if
(
*
pstr
)
TRACE
(
"string=%s
\n
"
,
debugstr_w
(
*
pstr
));
ALIGN_LENGTH
(
Start
,
3
);
Start
+=
sizeof
(
bstr_wire_t
)
+
((
SysStringByteLen
(
*
pstr
)
+
1
)
&
~
1
);
TRACE
(
"returning %
l
d
\n
"
,
Start
);
TRACE
(
"returning %d
\n
"
,
Start
);
return
Start
;
}
...
...
@@ -157,7 +157,7 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS
bstr_wire_t
*
header
;
DWORD
len
=
SysStringByteLen
(
*
pstr
);
TRACE
(
"(%
l
x,%p,%p) => %p
\n
"
,
*
pFlags
,
Buffer
,
pstr
,
*
pstr
);
TRACE
(
"(%x,%p,%p) => %p
\n
"
,
*
pFlags
,
Buffer
,
pstr
,
*
pstr
);
if
(
*
pstr
)
TRACE
(
"string=%s
\n
"
,
debugstr_w
(
*
pstr
));
ALIGN_POINTER
(
Buffer
,
3
);
...
...
@@ -177,7 +177,7 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS
unsigned
char
*
WINAPI
BSTR_UserUnmarshal
(
ULONG
*
pFlags
,
unsigned
char
*
Buffer
,
BSTR
*
pstr
)
{
bstr_wire_t
*
header
;
TRACE
(
"(%
l
x,%p,%p) => %p
\n
"
,
*
pFlags
,
Buffer
,
pstr
,
*
pstr
);
TRACE
(
"(%x,%p,%p) => %p
\n
"
,
*
pFlags
,
Buffer
,
pstr
,
*
pstr
);
ALIGN_POINTER
(
Buffer
,
3
);
header
=
(
bstr_wire_t
*
)
Buffer
;
...
...
@@ -199,7 +199,7 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer,
void
WINAPI
BSTR_UserFree
(
ULONG
*
pFlags
,
BSTR
*
pstr
)
{
TRACE
(
"(%
l
x,%p) => %p
\n
"
,
*
pFlags
,
pstr
,
*
pstr
);
TRACE
(
"(%x,%p) => %p
\n
"
,
*
pFlags
,
pstr
,
*
pstr
);
if
(
*
pstr
)
{
SysFreeString
(
*
pstr
);
...
...
@@ -338,7 +338,7 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu
ULONG
size
;
HRESULT
hr
;
TRACE
(
"pFlags=%
l
d, Buffer=%p, pvar=%p
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
TRACE
(
"pFlags=%d, Buffer=%p, pvar=%p
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
oldpos
=
Buffer
;
...
...
@@ -387,7 +387,7 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *
ULONG
size
;
HRESULT
hr
;
TRACE
(
"pFlags=%
l
d, Buffer=%p, pvar=%p
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
TRACE
(
"pFlags=%d, Buffer=%p, pvar=%p
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
oldpos
=
Buffer
;
...
...
@@ -427,7 +427,7 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *
ULONG
WINAPI
VARIANT_UserSize
(
ULONG
*
pFlags
,
ULONG
Start
,
VARIANT
*
pvar
)
{
int
align
;
TRACE
(
"(%
lx,%l
d,%p)
\n
"
,
*
pFlags
,
Start
,
pvar
);
TRACE
(
"(%
x,%
d,%p)
\n
"
,
*
pFlags
,
Start
,
pvar
);
TRACE
(
"vt=%04x
\n
"
,
V_VT
(
pvar
));
ALIGN_LENGTH
(
Start
,
7
);
...
...
@@ -443,7 +443,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar)
Start
+=
get_type_size
(
pFlags
,
pvar
);
Start
=
wire_extra_user_size
(
pFlags
,
Start
,
pvar
);
TRACE
(
"returning %
l
d
\n
"
,
Start
);
TRACE
(
"returning %d
\n
"
,
Start
);
return
Start
;
}
...
...
@@ -454,7 +454,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer,
int
align
;
unsigned
char
*
Pos
;
TRACE
(
"(%
l
x,%p,%p)
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
TRACE
(
"(%x,%p,%p)
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
TRACE
(
"vt=%04x
\n
"
,
V_VT
(
pvar
));
ALIGN_POINTER
(
Buffer
,
7
);
...
...
@@ -551,7 +551,7 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
int
align
;
unsigned
char
*
Pos
;
TRACE
(
"(%
l
x,%p,%p)
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
TRACE
(
"(%x,%p,%p)
\n
"
,
*
pFlags
,
Buffer
,
pvar
);
ALIGN_POINTER
(
Buffer
,
7
);
VariantInit
(
pvar
);
...
...
@@ -636,7 +636,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar)
VARTYPE
vt
=
V_VT
(
pvar
);
PVOID
ref
=
NULL
;
TRACE
(
"(%
l
x,%p)
\n
"
,
*
pFlags
,
pvar
);
TRACE
(
"(%x,%p)
\n
"
,
*
pFlags
,
pvar
);
TRACE
(
"vt=%04x
\n
"
,
V_VT
(
pvar
));
if
(
vt
&
VT_BYREF
)
ref
=
pvar
->
n1
.
n2
.
n3
.
byref
;
...
...
@@ -736,7 +736,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY
{
ULONG
size
=
StartingSize
;
TRACE
(
"("
);
dump_user_flags
(
pFlags
);
TRACE
(
", %
l
d, %p
\n
"
,
StartingSize
,
*
ppsa
);
TRACE
(
"("
);
dump_user_flags
(
pFlags
);
TRACE
(
", %d, %p
\n
"
,
StartingSize
,
*
ppsa
);
ALIGN_LENGTH
(
size
,
3
);
size
+=
sizeof
(
ULONG_PTR
);
...
...
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