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
420a7d06
Commit
420a7d06
authored
Jul 05, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
combase: Use nameless union/structs.
parent
9b67373c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
25 deletions
+17
-25
apartment.c
dlls/combase/apartment.c
+0
-2
combase.c
dlls/combase/combase.c
+0
-2
hglobalstream.c
dlls/combase/hglobalstream.c
+17
-19
usrmarshal.c
dlls/combase/usrmarshal.c
+0
-2
No files found.
dlls/combase/apartment.c
View file @
420a7d06
...
@@ -27,8 +27,6 @@
...
@@ -27,8 +27,6 @@
#include <assert.h>
#include <assert.h>
#define COBJMACROS
#define COBJMACROS
#define NONAMELESSUNION
#include "windef.h"
#include "windef.h"
#include "winbase.h"
#include "winbase.h"
#include "servprov.h"
#include "servprov.h"
...
...
dlls/combase/combase.c
View file @
420a7d06
...
@@ -18,8 +18,6 @@
...
@@ -18,8 +18,6 @@
*/
*/
#define COBJMACROS
#define COBJMACROS
#define NONAMELESSUNION
#include "ntstatus.h"
#include "ntstatus.h"
#define WIN32_NO_STATUS
#define WIN32_NO_STATUS
#define USE_COM_CONTEXT_DEF
#define USE_COM_CONTEXT_DEF
...
...
dlls/combase/hglobalstream.c
View file @
420a7d06
...
@@ -20,8 +20,6 @@
...
@@ -20,8 +20,6 @@
*/
*/
#define COBJMACROS
#define COBJMACROS
#define NONAMELESSUNION
#include "objbase.h"
#include "objbase.h"
#include "wine/debug.h"
#include "wine/debug.h"
...
@@ -151,8 +149,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea
...
@@ -151,8 +149,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea
if
(
!
read_len
)
if
(
!
read_len
)
read_len
=
&
dummy
;
read_len
=
&
dummy
;
if
(
stream
->
handle
->
size
>=
stream
->
position
.
u
.
LowPart
)
if
(
stream
->
handle
->
size
>=
stream
->
position
.
LowPart
)
len
=
min
(
stream
->
handle
->
size
-
stream
->
position
.
u
.
LowPart
,
cb
);
len
=
min
(
stream
->
handle
->
size
-
stream
->
position
.
LowPart
,
cb
);
else
else
len
=
0
;
len
=
0
;
...
@@ -164,8 +162,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea
...
@@ -164,8 +162,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea
return
S_OK
;
return
S_OK
;
}
}
memcpy
(
pv
,
buffer
+
stream
->
position
.
u
.
LowPart
,
len
);
memcpy
(
pv
,
buffer
+
stream
->
position
.
LowPart
,
len
);
stream
->
position
.
u
.
LowPart
+=
len
;
stream
->
position
.
LowPart
+=
len
;
*
read_len
=
len
;
*
read_len
=
len
;
...
@@ -191,10 +189,10 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
...
@@ -191,10 +189,10 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
*
written
=
0
;
*
written
=
0
;
size
.
u
.
HighPart
=
0
;
size
.
HighPart
=
0
;
size
.
u
.
LowPart
=
stream
->
position
.
u
.
LowPart
+
cb
;
size
.
LowPart
=
stream
->
position
.
LowPart
+
cb
;
if
(
size
.
u
.
LowPart
>
stream
->
handle
->
size
)
if
(
size
.
LowPart
>
stream
->
handle
->
size
)
{
{
/* grow stream */
/* grow stream */
HRESULT
hr
=
IStream_SetSize
(
iface
,
size
);
HRESULT
hr
=
IStream_SetSize
(
iface
,
size
);
...
@@ -212,8 +210,8 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
...
@@ -212,8 +210,8 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
return
S_OK
;
return
S_OK
;
}
}
memcpy
(
buffer
+
stream
->
position
.
u
.
LowPart
,
pv
,
cb
);
memcpy
(
buffer
+
stream
->
position
.
LowPart
,
pv
,
cb
);
stream
->
position
.
u
.
LowPart
+=
cb
;
stream
->
position
.
LowPart
+=
cb
;
GlobalUnlock
(
stream
->
handle
->
hglobal
);
GlobalUnlock
(
stream
->
handle
->
hglobal
);
...
@@ -247,10 +245,10 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig
...
@@ -247,10 +245,10 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig
goto
end
;
goto
end
;
}
}
position
.
u
.
HighPart
=
0
;
position
.
HighPart
=
0
;
position
.
u
.
LowPart
+=
move
.
QuadPart
;
position
.
LowPart
+=
move
.
QuadPart
;
if
(
move
.
u
.
LowPart
>=
0x80000000
&&
position
.
u
.
LowPart
>=
move
.
u
.
LowPart
)
if
(
move
.
LowPart
>=
0x80000000
&&
position
.
LowPart
>=
move
.
LowPart
)
{
{
/* We tried to seek backwards and went past the start. */
/* We tried to seek backwards and went past the start. */
hr
=
STG_E_SEEKERROR
;
hr
=
STG_E_SEEKERROR
;
...
@@ -272,15 +270,15 @@ static HRESULT WINAPI stream_SetSize(IStream *iface, ULARGE_INTEGER size)
...
@@ -272,15 +270,15 @@ static HRESULT WINAPI stream_SetSize(IStream *iface, ULARGE_INTEGER size)
TRACE
(
"%p, %s
\n
"
,
iface
,
wine_dbgstr_longlong
(
size
.
QuadPart
));
TRACE
(
"%p, %s
\n
"
,
iface
,
wine_dbgstr_longlong
(
size
.
QuadPart
));
if
(
stream
->
handle
->
size
==
size
.
u
.
LowPart
)
if
(
stream
->
handle
->
size
==
size
.
LowPart
)
return
S_OK
;
return
S_OK
;
hglobal
=
GlobalReAlloc
(
stream
->
handle
->
hglobal
,
size
.
u
.
LowPart
,
GMEM_MOVEABLE
);
hglobal
=
GlobalReAlloc
(
stream
->
handle
->
hglobal
,
size
.
LowPart
,
GMEM_MOVEABLE
);
if
(
!
hglobal
)
if
(
!
hglobal
)
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
stream
->
handle
->
hglobal
=
hglobal
;
stream
->
handle
->
hglobal
=
hglobal
;
stream
->
handle
->
size
=
size
.
u
.
LowPart
;
stream
->
handle
->
size
=
size
.
LowPart
;
return
S_OK
;
return
S_OK
;
}
}
...
@@ -292,7 +290,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE
...
@@ -292,7 +290,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE
HRESULT
hr
=
S_OK
;
HRESULT
hr
=
S_OK
;
BYTE
buffer
[
128
];
BYTE
buffer
[
128
];
TRACE
(
"%p, %p, %ld, %p, %p
\n
"
,
iface
,
dest
,
cb
.
u
.
LowPart
,
read_len
,
written
);
TRACE
(
"%p, %p, %ld, %p, %p
\n
"
,
iface
,
dest
,
cb
.
LowPart
,
read_len
,
written
);
if
(
!
dest
)
if
(
!
dest
)
return
STG_E_INVALIDPOINTER
;
return
STG_E_INVALIDPOINTER
;
...
@@ -302,7 +300,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE
...
@@ -302,7 +300,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE
while
(
cb
.
QuadPart
>
0
)
while
(
cb
.
QuadPart
>
0
)
{
{
ULONG
chunk_size
=
cb
.
QuadPart
>=
sizeof
(
buffer
)
?
sizeof
(
buffer
)
:
cb
.
u
.
LowPart
;
ULONG
chunk_size
=
cb
.
QuadPart
>=
sizeof
(
buffer
)
?
sizeof
(
buffer
)
:
cb
.
LowPart
;
ULONG
chunk_read
,
chunk_written
;
ULONG
chunk_read
,
chunk_written
;
hr
=
IStream_Read
(
iface
,
buffer
,
chunk_size
,
&
chunk_read
);
hr
=
IStream_Read
(
iface
,
buffer
,
chunk_size
,
&
chunk_read
);
...
...
dlls/combase/usrmarshal.c
View file @
420a7d06
...
@@ -20,8 +20,6 @@
...
@@ -20,8 +20,6 @@
*/
*/
#define COBJMACROS
#define COBJMACROS
#define NONAMELESSUNION
#include "ole2.h"
#include "ole2.h"
#include "wine/debug.h"
#include "wine/debug.h"
...
...
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