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
dd738eab
Commit
dd738eab
authored
Nov 25, 2002
by
Lionel Ulmer
Committed by
Alexandre Julliard
Nov 25, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Prevent the backbuffer to also have the frontbuffer flag set.
- Log the Locking flags. - Print symbolic name (if any) of zero values for bit fields (thanks Andi).
parent
2696ae4c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
3 deletions
+23
-3
main.c
dlls/ddraw/ddraw/main.c
+1
-1
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-0
main.c
dlls/ddraw/dsurface/main.c
+4
-1
helper.c
dlls/ddraw/helper.c
+17
-1
No files found.
dlls/ddraw/ddraw/main.c
View file @
dd738eab
...
...
@@ -451,7 +451,7 @@ create_primary(IDirectDrawImpl* This, LPDDSURFACEDESC2 pDDSD,
ddsd
.
dwFlags
&=
~
DDSD_BACKBUFFERCOUNT
;
ddsd
.
ddsCaps
.
dwCaps
&=
~
(
DDSCAPS_VISIBLE
|
DDSCAPS_PRIMARYSURFACE
|
DDSCAPS_BACKBUFFER
);
|
DDSCAPS_BACKBUFFER
|
DDSCAPS_FRONTBUFFER
);
primary
=
ICOM_OBJECT
(
IDirectDrawSurfaceImpl
,
IDirectDrawSurface7
,
*
ppSurf
);
...
...
dlls/ddraw/ddraw_private.h
View file @
dd738eab
...
...
@@ -354,6 +354,7 @@ extern void DDRAW_dump_pixelformat(const DDPIXELFORMAT *in);
extern
void
DDRAW_dump_colorkeyflag
(
DWORD
ck
);
extern
void
DDRAW_dump_surface_desc
(
const
DDSURFACEDESC2
*
lpddsd
);
extern
void
DDRAW_dump_cooperativelevel
(
DWORD
cooplevel
);
extern
void
DDRAW_dump_lockflag
(
DWORD
lockflag
);
extern
void
DDRAW_dump_DDCOLORKEY
(
const
DDCOLORKEY
*
in
);
extern
void
DDRAW_dump_DDCAPS
(
const
DDCAPS
*
lpcaps
);
#endif
/* __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H */
dlls/ddraw/dsurface/main.c
View file @
dd738eab
...
...
@@ -977,7 +977,10 @@ Main_DirectDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
{
ICOM_THIS
(
IDirectDrawSurfaceImpl
,
iface
);
TRACE
(
"(%p)->Lock(%p,%p,%08lx,%08lx)
\n
"
,
This
,
prect
,
pDDSD
,
flags
,(
DWORD
)
h
);
if
(
TRACE_ON
(
ddraw
))
{
TRACE
(
"(%p)->Lock(%p,%p,%08lx,%08lx)
\n
"
,
This
,
prect
,
pDDSD
,
flags
,(
DWORD
)
h
);
TRACE
(
" - locking flags : "
);
DDRAW_dump_lockflag
(
flags
);
}
if
(
flags
&
~
(
DDLOCK_WAIT
|
DDLOCK_READONLY
|
DDLOCK_WRITEONLY
))
WARN
(
"(%p)->Lock(%p,%p,%08lx,%08lx)
\n
"
,
...
...
dlls/ddraw/helper.c
View file @
dd738eab
...
...
@@ -66,7 +66,8 @@ static void DDRAW_dump_flags_(DWORD flags, const flag_info* names,
unsigned
int
i
;
for
(
i
=
0
;
i
<
num_names
;
i
++
)
if
(
names
[
i
].
val
&
flags
)
if
((
flags
&
names
[
i
].
val
)
||
/* standard flag value */
((
!
flags
)
&&
(
!
names
[
i
].
val
)))
/* zero value only */
DPRINTF
(
"%s "
,
names
[
i
].
name
);
if
(
newline
)
...
...
@@ -326,6 +327,21 @@ void DDRAW_dump_colorkeyflag(DWORD ck)
DDRAW_dump_flags
(
ck
,
flags
,
sizeof
(
flags
)
/
sizeof
(
flags
[
0
]));
}
void
DDRAW_dump_lockflag
(
DWORD
lockflag
)
{
static
const
flag_info
flags
[]
=
{
FE
(
DDLOCK_SURFACEMEMORYPTR
),
FE
(
DDLOCK_WAIT
),
FE
(
DDLOCK_EVENT
),
FE
(
DDLOCK_READONLY
),
FE
(
DDLOCK_WRITEONLY
),
FE
(
DDLOCK_NOSYSLOCK
)
};
DDRAW_dump_flags
(
lockflag
,
flags
,
sizeof
(
flags
)
/
sizeof
(
flags
[
0
]));
}
static
void
DDRAW_dump_DWORD
(
const
void
*
in
)
{
DPRINTF
(
"%ld"
,
*
((
const
DWORD
*
)
in
));
}
...
...
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