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
9678d0f9
Commit
9678d0f9
authored
Jun 29, 2022
by
Zhiyi Zhang
Committed by
Alexandre Julliard
Jun 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1/tests: Fix resource leaks.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53231
Signed-off-by:
Zhiyi Zhang
<
zzhang@codeweavers.com
>
parent
0519f53c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
d2d1.c
dlls/d2d1/tests/d2d1.c
+13
-5
No files found.
dlls/d2d1/tests/d2d1.c
View file @
9678d0f9
...
@@ -1168,7 +1168,8 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c
...
@@ -1168,7 +1168,8 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c
IDXGISurface_Release
(
ctx
->
surface
);
IDXGISurface_Release
(
ctx
->
surface
);
IDXGISwapChain_Release
(
ctx
->
swapchain
);
IDXGISwapChain_Release
(
ctx
->
swapchain
);
DestroyWindow
(
ctx
->
window
);
DestroyWindow
(
ctx
->
window
);
IDXGIDevice_Release
(
ctx
->
device
);
ref
=
IDXGIDevice_Release
(
ctx
->
device
);
ok_
(
__FILE__
,
line
)(
!
ref
,
"Device has %lu references left.
\n
"
,
ref
);
}
}
#define init_test_context(ctx, d3d11) init_test_context_(__LINE__, ctx, d3d11)
#define init_test_context(ctx, d3d11) init_test_context_(__LINE__, ctx, d3d11)
...
@@ -5182,18 +5183,19 @@ static void test_shared_bitmap(BOOL d3d11)
...
@@ -5182,18 +5183,19 @@ static void test_shared_bitmap(BOOL d3d11)
todo_wine_if
(
i
==
2
||
i
==
3
||
i
==
5
||
i
==
6
)
todo_wine_if
(
i
==
2
||
i
==
3
||
i
==
5
||
i
==
6
)
ok
(
hr
==
bitmap_format_tests
[
i
].
hr
,
"%u: Got unexpected hr %#lx.
\n
"
,
i
,
hr
);
ok
(
hr
==
bitmap_format_tests
[
i
].
hr
,
"%u: Got unexpected hr %#lx.
\n
"
,
i
,
hr
);
if
(
SUCCEEDED
(
bitmap_format_tests
[
i
].
hr
)
)
if
(
SUCCEEDED
(
hr
)
&&
hr
==
bitmap_format_tests
[
i
].
hr
)
{
{
pixel_format
=
ID2D1Bitmap_GetPixelFormat
(
bitmap2
);
pixel_format
=
ID2D1Bitmap_GetPixelFormat
(
bitmap2
);
ok
(
pixel_format
.
format
==
bitmap_format_tests
[
i
].
result
.
format
,
"%u: unexpected pixel format %#x.
\n
"
,
ok
(
pixel_format
.
format
==
bitmap_format_tests
[
i
].
result
.
format
,
"%u: unexpected pixel format %#x.
\n
"
,
i
,
pixel_format
.
format
);
i
,
pixel_format
.
format
);
ok
(
pixel_format
.
alphaMode
==
bitmap_format_tests
[
i
].
result
.
alphaMode
,
"%u: unexpected alpha mode %d.
\n
"
,
ok
(
pixel_format
.
alphaMode
==
bitmap_format_tests
[
i
].
result
.
alphaMode
,
"%u: unexpected alpha mode %d.
\n
"
,
i
,
pixel_format
.
alphaMode
);
i
,
pixel_format
.
alphaMode
);
}
if
(
SUCCEEDED
(
hr
))
ID2D1Bitmap_Release
(
bitmap2
);
ID2D1Bitmap_Release
(
bitmap2
);
}
}
}
}
}
ID2D1RenderTarget_Release
(
rt2
);
ID2D1RenderTarget_Release
(
rt2
);
...
@@ -5723,6 +5725,8 @@ static void test_draw_text_layout(BOOL d3d11)
...
@@ -5723,6 +5725,8 @@ static void test_draw_text_layout(BOOL d3d11)
IDWriteRenderingParams_Release
(
rendering_params
);
IDWriteRenderingParams_Release
(
rendering_params
);
}
}
ID2D1SolidColorBrush_Release
(
brush2
);
ID2D1SolidColorBrush_Release
(
brush
);
IDWriteTextFormat_Release
(
text_format
);
IDWriteTextFormat_Release
(
text_format
);
IDWriteTextLayout_Release
(
text_layout
);
IDWriteTextLayout_Release
(
text_layout
);
IDWriteFactory_Release
(
dwrite_factory
);
IDWriteFactory_Release
(
dwrite_factory
);
...
@@ -8899,7 +8903,7 @@ static void test_bitmap_surface(BOOL d3d11)
...
@@ -8899,7 +8903,7 @@ static void test_bitmap_surface(BOOL d3d11)
todo_wine_if
(
bitmap_format_tests
[
i
].
hr
==
WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT
)
todo_wine_if
(
bitmap_format_tests
[
i
].
hr
==
WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT
)
ok
(
hr
==
bitmap_format_tests
[
i
].
hr
,
"%u: Got unexpected hr %#lx.
\n
"
,
i
,
hr
);
ok
(
hr
==
bitmap_format_tests
[
i
].
hr
,
"%u: Got unexpected hr %#lx.
\n
"
,
i
,
hr
);
if
(
SUCCEEDED
(
bitmap_format_tests
[
i
].
hr
)
)
if
(
SUCCEEDED
(
hr
)
&&
hr
==
bitmap_format_tests
[
i
].
hr
)
{
{
pixel_format
=
ID2D1Bitmap1_GetPixelFormat
(
bitmap
);
pixel_format
=
ID2D1Bitmap1_GetPixelFormat
(
bitmap
);
...
@@ -8907,10 +8911,11 @@ static void test_bitmap_surface(BOOL d3d11)
...
@@ -8907,10 +8911,11 @@ static void test_bitmap_surface(BOOL d3d11)
i
,
pixel_format
.
format
);
i
,
pixel_format
.
format
);
ok
(
pixel_format
.
alphaMode
==
bitmap_format_tests
[
i
].
result
.
alphaMode
,
"%u: unexpected alpha mode %d.
\n
"
,
ok
(
pixel_format
.
alphaMode
==
bitmap_format_tests
[
i
].
result
.
alphaMode
,
"%u: unexpected alpha mode %d.
\n
"
,
i
,
pixel_format
.
alphaMode
);
i
,
pixel_format
.
alphaMode
);
}
if
(
SUCCEEDED
(
hr
))
ID2D1Bitmap1_Release
(
bitmap
);
ID2D1Bitmap1_Release
(
bitmap
);
}
}
}
/* A8 surface */
/* A8 surface */
surface2
=
create_surface
(
ctx
.
device
,
DXGI_FORMAT_A8_UNORM
);
surface2
=
create_surface
(
ctx
.
device
,
DXGI_FORMAT_A8_UNORM
);
...
@@ -8943,6 +8948,7 @@ static void test_bitmap_surface(BOOL d3d11)
...
@@ -8943,6 +8948,7 @@ static void test_bitmap_surface(BOOL d3d11)
ID2D1DeviceContext_SetTarget
(
device_context
,
(
ID2D1Image
*
)
bitmap
);
ID2D1DeviceContext_SetTarget
(
device_context
,
(
ID2D1Image
*
)
bitmap
);
ID2D1DeviceContext_GetTarget
(
device_context
,
&
target
);
ID2D1DeviceContext_GetTarget
(
device_context
,
&
target
);
ok
(
target
==
(
ID2D1Image
*
)
bitmap
,
"Unexpected target.
\n
"
);
ok
(
target
==
(
ID2D1Image
*
)
bitmap
,
"Unexpected target.
\n
"
);
ID2D1Image_Release
(
target
);
check_rt_bitmap_surface
((
ID2D1RenderTarget
*
)
device_context
,
TRUE
,
D2D1_BITMAP_OPTIONS_NONE
);
check_rt_bitmap_surface
((
ID2D1RenderTarget
*
)
device_context
,
TRUE
,
D2D1_BITMAP_OPTIONS_NONE
);
...
@@ -9036,6 +9042,7 @@ static void test_bitmap_surface(BOOL d3d11)
...
@@ -9036,6 +9042,7 @@ static void test_bitmap_surface(BOOL d3d11)
hr
=
ID2D1Factory1_CreateWicBitmapRenderTarget
(
factory
,
wic_bitmap
,
&
rt_desc
,
&
rt
);
hr
=
ID2D1Factory1_CreateWicBitmapRenderTarget
(
factory
,
wic_bitmap
,
&
rt_desc
,
&
rt
);
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
IWICBitmap_Release
(
wic_bitmap
);
check_rt_bitmap_surface
(
rt
,
FALSE
,
D2D1_BITMAP_OPTIONS_NONE
);
check_rt_bitmap_surface
(
rt
,
FALSE
,
D2D1_BITMAP_OPTIONS_NONE
);
ID2D1RenderTarget_Release
(
rt
);
ID2D1RenderTarget_Release
(
rt
);
...
@@ -9423,6 +9430,7 @@ static void test_command_list(BOOL d3d11)
...
@@ -9423,6 +9430,7 @@ static void test_command_list(BOOL d3d11)
{
{
ID2D1DeviceContext_Release
(
device_context
);
ID2D1DeviceContext_Release
(
device_context
);
ID2D1Factory1_Release
(
factory
);
ID2D1Factory1_Release
(
factory
);
release_test_context
(
&
ctx
);
return
;
return
;
}
}
...
...
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