Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5622f744
Commit
5622f744
authored
Jul 10, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw/tests: Fix a few tests that fail on Win64.
parent
74c985aa
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
3 deletions
+16
-3
d3d.c
dlls/ddraw/tests/d3d.c
+1
-0
dsurface.c
dlls/ddraw/tests/dsurface.c
+2
-1
overlay.c
dlls/ddraw/tests/overlay.c
+2
-1
refcount.c
dlls/ddraw/tests/refcount.c
+11
-1
No files found.
dlls/ddraw/tests/d3d.c
View file @
5622f744
...
...
@@ -951,6 +951,7 @@ static BOOL D3D1_createObjects(void)
ok
(
hr
==
DD_OK
,
"SetCooperativeLevel returned: %x
\n
"
,
hr
);
hr
=
IDirectDraw_QueryInterface
(
DirectDraw1
,
&
IID_IDirect3D
,
(
void
**
)
&
Direct3D1
);
if
(
hr
==
E_NOINTERFACE
)
return
FALSE
;
ok
(
hr
==
DD_OK
,
"QueryInterface returned: %x
\n
"
,
hr
);
if
(
!
Direct3D1
)
{
return
FALSE
;
...
...
dlls/ddraw/tests/dsurface.c
View file @
5622f744
...
...
@@ -1029,7 +1029,8 @@ static void IFaceRefCount(void)
todo_wine
ok
(
ref
==
2
,
"Refcount is %u, expected 2
\n
"
,
ref
);
/* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */
IDirectDrawSurface_QueryInterface
(
surf
,
&
IID_IDirect3DTexture
,
(
void
**
)
&
tex
);
ret
=
IDirectDrawSurface_QueryInterface
(
surf
,
&
IID_IDirect3DTexture
,
(
void
**
)
&
tex
);
if
(
ret
==
E_NOINTERFACE
)
return
;
/* win64 */
ref
=
getRefcount
((
IUnknown
*
)
tex
);
todo_wine
ok
(
ref
==
2
,
"Refcount is %u, expected 2
\n
"
,
ref
);
ref
=
getRefcount
((
IUnknown
*
)
surf
);
...
...
dlls/ddraw/tests/overlay.c
View file @
5622f744
...
...
@@ -200,7 +200,8 @@ static void yv12_test(void)
ok
(
desc
.
dwFlags
==
(
DDSD_WIDTH
|
DDSD_HEIGHT
|
DDSD_PIXELFORMAT
|
DDSD_CAPS
|
DDSD_PITCH
),
"Unexpected desc.dwFlags 0x%08x
\n
"
,
desc
.
dwFlags
);
ok
(
desc
.
ddsCaps
.
dwCaps
==
(
DDSCAPS_OVERLAY
|
DDSCAPS_VIDEOMEMORY
|
DDSCAPS_LOCALVIDMEM
),
ok
(
desc
.
ddsCaps
.
dwCaps
==
(
DDSCAPS_OVERLAY
|
DDSCAPS_VIDEOMEMORY
|
DDSCAPS_LOCALVIDMEM
)
||
desc
.
ddsCaps
.
dwCaps
==
(
DDSCAPS_OVERLAY
|
DDSCAPS_VIDEOMEMORY
|
DDSCAPS_LOCALVIDMEM
|
DDSCAPS_HWCODEC
),
"Unexpected desc.ddsCaps.dwCaps 0x%08x
\n
"
,
desc
.
ddsCaps
.
dwCaps
);
ok
(
desc
.
dwWidth
==
256
&&
desc
.
dwHeight
==
256
,
"Expected size 64x64, got %ux%u
\n
"
,
desc
.
dwWidth
,
desc
.
dwHeight
);
...
...
dlls/ddraw/tests/refcount.c
View file @
5622f744
...
...
@@ -237,7 +237,17 @@ static void test_iface_refcnt(void)
ok
(
ref
==
1
,
"IDirectDraw reference count is %ld
\n
"
,
ref
);
hr
=
IDirectDraw7_QueryInterface
(
DDraw7
,
&
IID_IDirect3D7
,
(
void
**
)
&
D3D7
);
ok
(
hr
==
DD_OK
,
"IDirectDraw7_QueryInterface returned %08x
\n
"
,
hr
);
ok
(
hr
==
DD_OK
||
hr
==
E_NOINTERFACE
,
/* win64 */
"IDirectDraw7_QueryInterface returned %08x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
{
IDirectDraw7_Release
(
DDraw7
);
IDirectDraw4_Release
(
DDraw4
);
IDirectDraw2_Release
(
DDraw2
);
IDirectDraw_Release
(
DDraw1
);
skip
(
"no IDirect3D7 support
\n
"
);
return
;
}
/* Apparently IDirectDrawX and IDirect3DX are linked together */
ref
=
getRefcount
(
(
IUnknown
*
)
D3D7
);
...
...
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