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
e8bef37c
Commit
e8bef37c
authored
Mar 13, 2018
by
Matteo Bruni
Committed by
Alexandre Julliard
Mar 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9/tests: Disable a test crashing on Win10.
Signed-off-by:
Matteo Bruni
<
mbruni@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7dbcbed7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
surface.c
dlls/d3dx9_36/tests/surface.c
+6
-1
No files found.
dlls/d3dx9_36/tests/surface.c
View file @
e8bef37c
...
...
@@ -944,17 +944,22 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
ok
(
SUCCEEDED
(
hr
),
"Failed to unlock surface, hr %#x.
\n
"
,
hr
);
/* Test D3DXLoadSurfaceFromMemory with indexed color image */
if
(
0
)
{
/* Crashes on Nvidia Win10. */
palette
.
peRed
=
bmp_1bpp
[
56
];
palette
.
peGreen
=
bmp_1bpp
[
55
];
palette
.
peBlue
=
bmp_1bpp
[
54
];
palette
.
peFlags
=
bmp_1bpp
[
57
];
/* peFlags is the alpha component in DX8 and higher */
hr
=
D3DXLoadSurfaceFromMemory
(
surf
,
NULL
,
NULL
,
&
bmp_1bpp
[
62
],
D3DFMT_P8
,
4
,
(
const
PALETTEENTRY
*
)
&
palette
,
&
rect
,
D3DX_FILTER_NONE
,
0
);
hr
=
D3DXLoadSurfaceFromMemory
(
surf
,
NULL
,
NULL
,
&
bmp_1bpp
[
62
],
D3DFMT_P8
,
1
,
(
const
PALETTEENTRY
*
)
&
palette
,
&
rect
,
D3DX_FILTER_NONE
,
0
);
ok
(
hr
==
D3D_OK
,
"D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x
\n
"
,
hr
,
D3D_OK
);
hr
=
IDirect3DSurface9_LockRect
(
surf
,
&
lockrect
,
NULL
,
D3DLOCK_READONLY
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock surface, hr %#x
\n
"
,
hr
);
ok
(
*
(
DWORD
*
)
lockrect
.
pBits
==
0x80f3f2f1
,
"Pixel color mismatch: got %#x, expected 0x80f3f2f1
\n
"
,
*
(
DWORD
*
)
lockrect
.
pBits
);
hr
=
IDirect3DSurface9_UnlockRect
(
surf
);
ok
(
SUCCEEDED
(
hr
),
"Failed to unlock surface, hr %#x
\n
"
,
hr
);
}
/* Test D3DXLoadSurfaceFromFileInMemory with indexed color image (alpha is not taken into account for bmp file) */
hr
=
D3DXLoadSurfaceFromFileInMemory
(
surf
,
NULL
,
NULL
,
bmp_1bpp
,
sizeof
(
bmp_1bpp
),
NULL
,
D3DX_FILTER_NONE
,
0
,
NULL
);
...
...
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