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
d56b7c20
Commit
d56b7c20
authored
Dec 02, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create().
parent
7052c873
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
13 deletions
+4
-13
surface.c
dlls/ddraw/surface.c
+4
-13
No files found.
dlls/ddraw/surface.c
View file @
d56b7c20
...
@@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
...
@@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
{
{
ERR
(
"Failed to get display mode, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to get display mode, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
return
hr
;
return
hr
_ddraw_from_wined3d
(
hr
)
;
}
}
/* No pixelformat given? Use the current screen format. */
/* No pixelformat given? Use the current screen format. */
...
@@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
...
@@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
{
{
ERR
(
"Failed to reset device.
\n
"
);
ERR
(
"Failed to reset device.
\n
"
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
return
hr
;
return
hr
_ddraw_from_wined3d
(
hr
)
;
}
}
}
}
}
}
...
@@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
...
@@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
WINED3D_SURFACE_PIN_SYSMEM
,
texture
,
&
ddraw_texture_wined3d_parent_ops
,
&
wined3d_texture
)))
WINED3D_SURFACE_PIN_SYSMEM
,
texture
,
&
ddraw_texture_wined3d_parent_ops
,
&
wined3d_texture
)))
{
{
WARN
(
"Failed to create wined3d texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d texture, hr %#x.
\n
"
,
hr
);
switch
(
hr
)
{
case
WINED3DERR_INVALIDCALL
:
hr
=
DDERR_INVALIDPARAMS
;
break
;
default:
FIXME
(
"Unexpected wined3d error %#x.
\n
"
,
hr
);
break
;
}
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
return
hr
;
return
hr
_ddraw_from_wined3d
(
hr
)
;
}
}
resource
=
wined3d_texture_get_sub_resource
(
wined3d_texture
,
0
);
resource
=
wined3d_texture_get_sub_resource
(
wined3d_texture
,
0
);
...
@@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
...
@@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
WINED3D_SURFACE_PIN_SYSMEM
,
texture
,
&
ddraw_texture_wined3d_parent_ops
,
&
wined3d_texture
)))
WINED3D_SURFACE_PIN_SYSMEM
,
texture
,
&
ddraw_texture_wined3d_parent_ops
,
&
wined3d_texture
)))
{
{
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
hr
=
hr_ddraw_from_wined3d
(
hr
);
goto
fail
;
goto
fail
;
}
}
...
...
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