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
29b794dc
Commit
29b794dc
authored
Sep 11, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Ignore the colour model in d3d3_FindDevice().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8a66164f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
ddraw.c
dlls/ddraw/ddraw.c
+2
-6
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+1
-1
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+1
-1
ddraw4.c
dlls/ddraw/tests/ddraw4.c
+1
-1
No files found.
dlls/ddraw/ddraw.c
View file @
29b794dc
...
...
@@ -4049,12 +4049,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd
||
fdr
->
dwSize
!=
sizeof
(
D3DFINDDEVICERESULT
))
return
DDERR_INVALIDPARAMS
;
if
((
fds
->
dwFlags
&
D3DFDS_COLORMODEL
)
&&
fds
->
dcmColorModel
!=
D3DCOLOR_RGB
)
{
WARN
(
"Trying to request a non-RGB D3D color model. Not supported.
\n
"
);
return
DDERR_INVALIDPARAMS
;
/* No real idea what to return here :-) */
}
if
(
fds
->
dwFlags
&
D3DFDS_COLORMODEL
)
WARN
(
"Ignoring colour model %#x.
\n
"
,
fds
->
dcmColorModel
);
if
(
fds
->
dwFlags
&
D3DFDS_GUID
)
{
...
...
dlls/ddraw/tests/ddraw1.c
View file @
29b794dc
...
...
@@ -11812,7 +11812,7 @@ static void test_find_device(void)
search
.
dcmColorModel
=
0xdeadbeef
;
result
.
dwSize
=
sizeof
(
result
);
hr
=
IDirect3D_FindDevice
(
d3d
,
&
search
,
&
result
);
todo_wine
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
IDirect3D_Release
(
d3d
);
IDirectDraw_Release
(
ddraw
);
...
...
dlls/ddraw/tests/ddraw2.c
View file @
29b794dc
...
...
@@ -13094,7 +13094,7 @@ static void test_find_device(void)
search
.
dcmColorModel
=
0xdeadbeef
;
result
.
dwSize
=
sizeof
(
result
);
hr
=
IDirect3D2_FindDevice
(
d3d
,
&
search
,
&
result
);
todo_wine
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
IDirect3D2_Release
(
d3d
);
IDirectDraw2_Release
(
ddraw
);
...
...
dlls/ddraw/tests/ddraw4.c
View file @
29b794dc
...
...
@@ -15186,7 +15186,7 @@ static void test_find_device(void)
search
.
dcmColorModel
=
0xdeadbeef
;
result
.
dwSize
=
sizeof
(
result
);
hr
=
IDirect3D3_FindDevice
(
d3d
,
&
search
,
&
result
);
todo_wine
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3D_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
IDirect3D3_Release
(
d3d
);
IDirectDraw4_Release
(
ddraw
);
...
...
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