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
30ef7f0b
Commit
30ef7f0b
authored
Aug 09, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Aug 10, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Minor cursor fixes.
parent
ea755999
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
2 deletions
+91
-2
device.c
dlls/d3d9/device.c
+4
-0
device.c
dlls/d3d9/tests/device.c
+83
-0
device.c
dlls/wined3d/device.c
+4
-2
No files found.
dlls/d3d9/device.c
View file @
30ef7f0b
...
...
@@ -147,6 +147,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC
IDirect3DDevice9Impl
*
This
=
(
IDirect3DDevice9Impl
*
)
iface
;
IDirect3DSurface9Impl
*
pSurface
=
(
IDirect3DSurface9Impl
*
)
pCursorBitmap
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
if
(
!
pCursorBitmap
)
{
WARN
(
"No cursor bitmap, returning WINED3DERR_INVALIDCALL
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
return
IWineD3DDevice_SetCursorProperties
(
This
->
WineD3DDevice
,
XHotSpot
,
YHotSpot
,(
IWineD3DSurface
*
)
pSurface
->
wineD3DSurface
);
}
...
...
dlls/d3d9/tests/device.c
View file @
30ef7f0b
...
...
@@ -392,6 +392,88 @@ cleanup:
DestroyWindow
(
hwnd
);
}
static
void
test_cursor
(
void
)
{
HRESULT
hr
;
HWND
hwnd
=
NULL
;
IDirect3D9
*
pD3d
=
NULL
;
IDirect3DDevice9
*
pDevice
=
NULL
;
D3DPRESENT_PARAMETERS
d3dpp
;
D3DDISPLAYMODE
d3ddm
;
CURSORINFO
info
;
IDirect3DSurface9
*
cursor
=
NULL
;
HCURSOR
cur
;
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
hr
=
GetCursorInfo
(
&
info
);
cur
=
info
.
hCursor
;
pD3d
=
pDirect3DCreate9
(
D3D_SDK_VERSION
);
ok
(
pD3d
!=
NULL
,
"Failed to create IDirect3D9 object
\n
"
);
hwnd
=
CreateWindow
(
"static"
,
"d3d9_test"
,
WS_OVERLAPPEDWINDOW
,
100
,
100
,
160
,
160
,
NULL
,
NULL
,
NULL
,
NULL
);
ok
(
hwnd
!=
NULL
,
"Failed to create window
\n
"
);
if
(
!
pD3d
||
!
hwnd
)
goto
cleanup
;
IDirect3D9_GetAdapterDisplayMode
(
pD3d
,
D3DADAPTER_DEFAULT
,
&
d3ddm
);
ZeroMemory
(
&
d3dpp
,
sizeof
(
d3dpp
)
);
d3dpp
.
Windowed
=
TRUE
;
d3dpp
.
SwapEffect
=
D3DSWAPEFFECT_DISCARD
;
d3dpp
.
BackBufferFormat
=
d3ddm
.
Format
;
hr
=
IDirect3D9_CreateDevice
(
pD3d
,
D3DADAPTER_DEFAULT
,
D3DDEVTYPE_NULLREF
,
hwnd
,
D3DCREATE_SOFTWARE_VERTEXPROCESSING
,
&
d3dpp
,
&
pDevice
);
ok
(
SUCCEEDED
(
hr
),
"Failed to create IDirect3D9Device (%s)
\n
"
,
DXGetErrorString9
(
hr
));
if
(
FAILED
(
hr
))
goto
cleanup
;
IDirect3DDevice9_CreateOffscreenPlainSurface
(
pDevice
,
32
,
32
,
D3DFMT_A8R8G8B8
,
D3DPOOL_SCRATCH
,
&
cursor
,
0
);
ok
(
cursor
!=
NULL
,
"IDirect3DDevice9_CreateOffscreenPlainSurface failed with %08lx
\n
"
,
hr
);
/* Initially hidden */
hr
=
IDirect3DDevice9_ShowCursor
(
pDevice
,
TRUE
);
ok
(
hr
==
FALSE
,
"IDirect3DDevice9_ShowCursor returned %08lx
\n
"
,
hr
);
/* Not enabled without a surface*/
hr
=
IDirect3DDevice9_ShowCursor
(
pDevice
,
TRUE
);
ok
(
hr
==
FALSE
,
"IDirect3DDevice9_ShowCursor returned %08lx
\n
"
,
hr
);
/* Fails */
hr
=
IDirect3DDevice9_SetCursorProperties
(
pDevice
,
0
,
0
,
NULL
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"IDirect3DDevice9_SetCursorProperties returned %08lx
\n
"
,
hr
);
hr
=
IDirect3DDevice9_SetCursorProperties
(
pDevice
,
0
,
0
,
cursor
);
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_SetCursorProperties returned %08lx
\n
"
,
hr
);
IDirect3DSurface9_Release
(
cursor
);
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
hr
=
GetCursorInfo
(
&
info
);
ok
(
hr
!=
0
,
"GetCursorInfo returned %08lx
\n
"
,
hr
);
ok
(
info
.
flags
&
CURSOR_SHOWING
,
"The gdi cursor is hidden (%08lx)
\n
"
,
info
.
flags
);
ok
(
info
.
hCursor
==
cur
,
"The cursor handle is %p
\n
"
,
info
.
hCursor
);
/* unchanged */
/* Still hidden */
hr
=
IDirect3DDevice9_ShowCursor
(
pDevice
,
TRUE
);
ok
(
hr
==
FALSE
,
"IDirect3DDevice9_ShowCursor returned %08lx
\n
"
,
hr
);
/* Enabled now*/
hr
=
IDirect3DDevice9_ShowCursor
(
pDevice
,
TRUE
);
ok
(
hr
==
TRUE
,
"IDirect3DDevice9_ShowCursor returned %08lx
\n
"
,
hr
);
/* GDI cursor unchanged */
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
hr
=
GetCursorInfo
(
&
info
);
ok
(
hr
!=
0
,
"GetCursorInfo returned %08lx
\n
"
,
hr
);
ok
(
info
.
flags
&
CURSOR_SHOWING
,
"The gdi cursor is hidden (%08lx)
\n
"
,
info
.
flags
);
ok
(
info
.
hCursor
==
cur
,
"The cursor handle is %p
\n
"
,
info
.
hCursor
);
/* unchanged */
cleanup:
if
(
pD3d
)
IDirect3D9_Release
(
pD3d
);
if
(
pDevice
)
IDirect3D9_Release
(
pDevice
);
}
START_TEST
(
device
)
{
HMODULE
d3d9_handle
=
LoadLibraryA
(
"d3d9.dll"
);
...
...
@@ -402,5 +484,6 @@ START_TEST(device)
test_swapchain
();
test_refcount
();
test_mipmap_levels
();
test_cursor
();
}
}
dlls/wined3d/device.c
View file @
30ef7f0b
...
...
@@ -7659,11 +7659,13 @@ static void WINAPI IWineD3DDeviceImpl_SetCursorPosition(IWineD3DDevice* ifa
static
BOOL
WINAPI
IWineD3DDeviceImpl_ShowCursor
(
IWineD3DDevice
*
iface
,
BOOL
bShow
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
BOOL
oldVisible
=
This
->
bCursorVisible
;
TRACE
(
"(%p) : visible(%d)
\n
"
,
This
,
bShow
);
This
->
bCursorVisible
=
bShow
;
if
(
This
->
cursorTexture
)
This
->
bCursorVisible
=
bShow
;
return
WINED3D_OK
;
return
oldVisible
;
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_TestCooperativeLevel
(
IWineD3DDevice
*
iface
)
{
...
...
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