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
45147b82
Commit
45147b82
authored
Feb 16, 2014
by
Erich E. Hoover
Committed by
Alexandre Julliard
Aug 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Return empty D3D hardware flags for RGB device enumeration.
parent
a56ea6e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
ddraw.c
dlls/ddraw/ddraw.c
+2
-0
d3d.c
dlls/ddraw/tests/d3d.c
+12
-0
No files found.
dlls/ddraw/ddraw.c
View file @
45147b82
...
...
@@ -3683,6 +3683,8 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
|
D3DPTEXTURECAPS_NONPOW2CONDITIONAL
|
D3DPTEXTURECAPS_PERSPECTIVE
);
/* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */
hal_desc
.
dcmColorModel
=
0
;
/* RGB, RAMP and MMX devices cannot report HAL hardware flags */
hal_desc
.
dwFlags
=
0
;
hr
=
callback
((
GUID
*
)
&
IID_IDirect3DRGBDevice
,
reference_description
,
device_name
,
&
hal_desc
,
&
hel_desc
,
context
);
...
...
dlls/ddraw/tests/d3d.c
View file @
45147b82
...
...
@@ -537,12 +537,18 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription,
ok
(
hal
->
dcmColorModel
==
0
,
"RGB Device %u hal caps has colormodel %u
\n
"
,
ver
,
hal
->
dcmColorModel
);
ok
(
hel
->
dcmColorModel
==
D3DCOLOR_RGB
,
"RGB Device %u hel caps has colormodel %u
\n
"
,
ver
,
hel
->
dcmColorModel
);
ok
(
hal
->
dwFlags
==
0
,
"RGB Device %u hal caps has hardware flags %x
\n
"
,
ver
,
hal
->
dwFlags
);
ok
(
hel
->
dwFlags
!=
0
,
"RGB Device %u hel caps has hardware flags %x
\n
"
,
ver
,
hel
->
dwFlags
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DHALDevice
,
Guid
))
{
trace
(
"HAL Device %d
\n
"
,
ver
);
ok
(
hal
->
dcmColorModel
==
D3DCOLOR_RGB
,
"HAL Device %u hal caps has colormodel %u
\n
"
,
ver
,
hel
->
dcmColorModel
);
ok
(
hel
->
dcmColorModel
==
0
,
"HAL Device %u hel caps has colormodel %u
\n
"
,
ver
,
hel
->
dcmColorModel
);
ok
(
hal
->
dwFlags
!=
0
,
"HAL Device %u hal caps has hardware flags %x
\n
"
,
ver
,
hal
->
dwFlags
);
ok
(
hel
->
dwFlags
!=
0
,
"HAL Device %u hel caps has hardware flags %x
\n
"
,
ver
,
hel
->
dwFlags
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DRefDevice
,
Guid
))
{
...
...
@@ -587,6 +593,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription,
ok
(
hal
->
dcmColorModel
==
0
,
"Ramp Device %u hal caps has colormodel %u
\n
"
,
ver
,
hal
->
dcmColorModel
);
ok
(
hel
->
dcmColorModel
==
D3DCOLOR_MONO
,
"Ramp Device %u hel caps has colormodel %u
\n
"
,
ver
,
hel
->
dcmColorModel
);
ok
(
hal
->
dwFlags
==
0
,
"Ramp Device %u hal caps has hardware flags %x
\n
"
,
ver
,
hal
->
dwFlags
);
ok
(
hel
->
dwFlags
!=
0
,
"Ramp Device %u hel caps has hardware flags %x
\n
"
,
ver
,
hel
->
dwFlags
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DMMXDevice
,
Guid
))
{
...
...
@@ -610,6 +619,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription,
ok
(
hal
->
dcmColorModel
==
0
,
"MMX Device %u hal caps has colormodel %u
\n
"
,
ver
,
hal
->
dcmColorModel
);
ok
(
hel
->
dcmColorModel
==
D3DCOLOR_RGB
,
"MMX Device %u hel caps has colormodel %u
\n
"
,
ver
,
hel
->
dcmColorModel
);
ok
(
hal
->
dwFlags
==
0
,
"MMX Device %u hal caps has hardware flags %x
\n
"
,
ver
,
hal
->
dwFlags
);
ok
(
hel
->
dwFlags
!=
0
,
"MMX Device %u hel caps has hardware flags %x
\n
"
,
ver
,
hel
->
dwFlags
);
}
else
{
...
...
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