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
fc4aa804
Commit
fc4aa804
authored
Jan 09, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8/tests: Use GetCursorInfo() directly.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cb9f5e7d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
13 deletions
+3
-13
device.c
dlls/d3d8/tests/device.c
+3
-13
No files found.
dlls/d3d8/tests/device.c
View file @
fc4aa804
...
...
@@ -55,8 +55,6 @@ static DEVMODEW registry_mode;
static
HRESULT
(
WINAPI
*
ValidateVertexShader
)(
const
DWORD
*
,
const
DWORD
*
,
const
D3DCAPS8
*
,
BOOL
,
char
**
);
static
HRESULT
(
WINAPI
*
ValidatePixelShader
)(
const
DWORD
*
,
const
D3DCAPS8
*
,
BOOL
,
char
**
);
static
BOOL
(
WINAPI
*
pGetCursorInfo
)(
PCURSORINFO
);
static
const
DWORD
simple_vs
[]
=
{
0xFFFE0101
,
/* vs_1_1 */
0x00000009
,
0xC0010000
,
0x90E40000
,
0xA0E40000
,
/* dp4 oPos.x, v0, c0 */
0x00000009
,
0xC0020000
,
0x90E40000
,
0xA0E40001
,
/* dp4 oPos.y, v0, c1 */
...
...
@@ -930,7 +928,6 @@ cleanup:
static
void
test_cursor
(
void
)
{
HMODULE
user32_handle
=
GetModuleHandleA
(
"user32.dll"
);
IDirect3DSurface8
*
cursor
=
NULL
;
IDirect3DDevice8
*
device
;
CURSORINFO
info
;
...
...
@@ -941,13 +938,6 @@ static void test_cursor(void)
HRESULT
hr
;
BOOL
ret
;
pGetCursorInfo
=
(
void
*
)
GetProcAddress
(
user32_handle
,
"GetCursorInfo"
);
if
(
!
pGetCursorInfo
)
{
win_skip
(
"GetCursorInfo is not available
\n
"
);
return
;
}
window
=
create_window
();
ok
(
!!
window
,
"Failed to create a window.
\n
"
);
...
...
@@ -957,7 +947,7 @@ static void test_cursor(void)
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
ok
(
p
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
ok
(
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
cur
=
info
.
hCursor
;
d3d
=
Direct3DCreate8
(
D3D_SDK_VERSION
);
...
...
@@ -990,7 +980,7 @@ static void test_cursor(void)
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
ok
(
p
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
ok
(
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
ok
(
info
.
flags
&
(
CURSOR_SHOWING
|
CURSOR_SUPPRESSED
),
"The gdi cursor is hidden (%08x)
\n
"
,
info
.
flags
);
ok
(
info
.
hCursor
==
cur
,
"The cursor handle is %p
\n
"
,
info
.
hCursor
);
/* unchanged */
...
...
@@ -1004,7 +994,7 @@ static void test_cursor(void)
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
ok
(
p
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
ok
(
GetCursorInfo
(
&
info
),
"GetCursorInfo failed
\n
"
);
ok
(
info
.
flags
&
(
CURSOR_SHOWING
|
CURSOR_SUPPRESSED
),
"The gdi cursor is hidden (%08x)
\n
"
,
info
.
flags
);
ok
(
info
.
hCursor
!=
cur
,
"The cursor handle is %p
\n
"
,
info
.
hCursor
);
...
...
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