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
90592714
Commit
90592714
authored
Mar 07, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 07, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Check subresources for NULL during texture cleanup.
This fixes a regression introduced by
1de6adfb
.
parent
cc2cd5a5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
cubetexture.c
dlls/wined3d/cubetexture.c
+4
-2
texture.c
dlls/wined3d/texture.c
+5
-2
volumetexture.c
dlls/wined3d/volumetexture.c
+4
-2
No files found.
dlls/wined3d/cubetexture.c
View file @
90592714
...
...
@@ -179,10 +179,12 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This)
for
(
i
=
0
;
i
<
sub_count
;
++
i
)
{
IWineD3DSurfaceImpl
*
surface
=
surface_from_resource
(
This
->
baseTexture
.
sub_resources
[
i
])
;
struct
wined3d_resource
*
sub_resource
=
This
->
baseTexture
.
sub_resources
[
i
]
;
if
(
su
rfa
ce
)
if
(
su
b_resour
ce
)
{
IWineD3DSurfaceImpl
*
surface
=
surface_from_resource
(
sub_resource
);
/* Clean out the texture name we gave to the surface so that the
* surface doesn't try and release it. */
surface_set_texture_name
(
surface
,
0
,
TRUE
);
...
...
dlls/wined3d/texture.c
View file @
90592714
...
...
@@ -201,9 +201,12 @@ static void texture_cleanup(IWineD3DTextureImpl *This)
for
(
i
=
0
;
i
<
This
->
baseTexture
.
level_count
;
++
i
)
{
IWineD3DSurfaceImpl
*
surface
=
surface_from_resource
(
This
->
baseTexture
.
sub_resources
[
i
]);
if
(
surface
)
struct
wined3d_resource
*
sub_resource
=
This
->
baseTexture
.
sub_resources
[
i
];
if
(
sub_resource
)
{
IWineD3DSurfaceImpl
*
surface
=
surface_from_resource
(
sub_resource
);
/* Clean out the texture name we gave to the surface so that the
* surface doesn't try and release it */
surface_set_texture_name
(
surface
,
0
,
TRUE
);
...
...
dlls/wined3d/volumetexture.c
View file @
90592714
...
...
@@ -121,10 +121,12 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This)
for
(
i
=
0
;
i
<
This
->
baseTexture
.
level_count
;
++
i
)
{
IWineD3DVolumeImpl
*
volume
=
volume_from_resource
(
This
->
baseTexture
.
sub_resources
[
i
])
;
struct
wined3d_resource
*
sub_resource
=
This
->
baseTexture
.
sub_resources
[
i
]
;
if
(
volum
e
)
if
(
sub_resourc
e
)
{
IWineD3DVolumeImpl
*
volume
=
volume_from_resource
(
sub_resource
);
/* Cleanup the container. */
volume_set_container
(
volume
,
NULL
);
IWineD3DVolume_Release
((
IWineD3DVolume
*
)
volume
);
...
...
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