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
1b94a5ee
Commit
1b94a5ee
authored
May 07, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
May 10, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Fix stupid bug when setting surface client memory.
parent
df891b82
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
surface.c
dlls/ddraw/surface.c
+7
-8
No files found.
dlls/ddraw/surface.c
View file @
1b94a5ee
...
...
@@ -2001,12 +2001,6 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(IDirectDrawSurface7 *iface,
if
(
!
DDSD
)
return
DDERR_INVALIDPARAMS
;
if
(
DDSD
->
dwFlags
&
DDSD_LPSURFACE
&&
DDSD
->
lpSurface
)
{
ERR
(
"Setting the surface memory isn't supported yet
\n
"
);
return
DDERR_INVALIDPARAMS
;
}
if
(
DDSD
->
dwFlags
&
DDSD_PIXELFORMAT
)
{
newFormat
=
PixelFormat_DD2WineD3D
(
&
DDSD
->
u4
.
ddpfPixelFormat
);
...
...
@@ -2047,14 +2041,19 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(IDirectDrawSurface7 *iface,
DDCKEY_SRCBLT
,
(
WINEDDCOLORKEY
*
)
&
DDSD
->
ddckCKSrcBlt
);
}
if
(
DDSD
->
dwFlags
&
DDSD_LPSURFACE
)
if
(
DDSD
->
dwFlags
&
DDSD_LPSURFACE
&&
DDSD
->
lpSurface
)
{
hr
=
IWineD3DSurface_SetMem
(
This
->
WineD3DSurface
,
DDSD
->
lpSurface
);
if
(
hr
!=
WINED3D_OK
)
{
/* No need for a trace here, wined3d does that for us */
return
hr
;
switch
(
hr
)
{
case
WINED3DERR_INVALIDCALL
:
return
DDERR_INVALIDPARAMS
;
default:
break
;
/* Go on */
}
}
}
This
->
surface_desc
=
*
DDSD
;
...
...
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