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
cd957f5b
Commit
cd957f5b
authored
Oct 27, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 27, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Partially implement IDirect3D9Ex::CreateDeviceEx().
parent
5e24ccfd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
9 deletions
+30
-9
d3d9_private.h
dlls/d3d9/d3d9_private.h
+1
-1
device.c
dlls/d3d9/device.c
+4
-1
directx.c
dlls/d3d9/directx.c
+25
-7
No files found.
dlls/d3d9/d3d9_private.h
View file @
cd957f5b
...
@@ -181,7 +181,7 @@ typedef struct IDirect3DDevice9Impl
...
@@ -181,7 +181,7 @@ typedef struct IDirect3DDevice9Impl
}
IDirect3DDevice9Impl
;
}
IDirect3DDevice9Impl
;
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IWineD3D
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IWineD3D
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
)
DECLSPEC_HIDDEN
;
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
DECLSPEC_HIDDEN
;
/*****************************************************************************
/*****************************************************************************
* IDirect3DVolume9 implementation structure
* IDirect3DVolume9 implementation structure
...
...
dlls/d3d9/device.c
View file @
cd957f5b
...
@@ -3242,12 +3242,15 @@ static void setup_fpu(void)
...
@@ -3242,12 +3242,15 @@ static void setup_fpu(void)
}
}
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IWineD3D
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IWineD3D
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
)
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
{
{
WINED3DPRESENT_PARAMETERS
*
wined3d_parameters
;
WINED3DPRESENT_PARAMETERS
*
wined3d_parameters
;
UINT
i
,
count
=
1
;
UINT
i
,
count
=
1
;
HRESULT
hr
;
HRESULT
hr
;
if
(
mode
)
FIXME
(
"Ignoring display mode.
\n
"
);
device
->
lpVtbl
=
&
Direct3DDevice9_Vtbl
;
device
->
lpVtbl
=
&
Direct3DDevice9_Vtbl
;
device
->
device_parent_vtbl
=
&
d3d9_wined3d_device_parent_vtbl
;
device
->
device_parent_vtbl
=
&
d3d9_wined3d_device_parent_vtbl
;
device
->
ref
=
1
;
device
->
ref
=
1
;
...
...
dlls/d3d9/directx.c
View file @
cd957f5b
...
@@ -425,7 +425,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex
...
@@ -425,7 +425,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
}
}
hr
=
device_init
(
object
,
This
->
WineD3D
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
);
hr
=
device_init
(
object
,
This
->
WineD3D
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
NULL
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
...
@@ -469,14 +469,32 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3
...
@@ -469,14 +469,32 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
,
IDirect3DDevice9Ex
**
device
)
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
,
IDirect3DDevice9Ex
**
device
)
{
{
FIXME
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x,
\n
"
IDirect3D9Impl
*
d3d9
=
(
IDirect3D9Impl
*
)
iface
;
"parameters %p, mode %p, device %p stub!
\n
"
,
IDirect3DDevice9Impl
*
object
;
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
HRESULT
hr
;
parameters
,
mode
,
device
);
*
device
=
NULL
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.
\n
"
,
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
,
device
);
return
D3DERR_DRIVERINTERNALERROR
;
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
{
ERR
(
"Failed to allocate device memory.
\n
"
);
return
E_OUTOFMEMORY
;
}
hr
=
device_init
(
object
,
d3d9
->
WineD3D
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
}
TRACE
(
"Created device %p.
\n
"
,
object
);
*
device
=
(
IDirect3DDevice9Ex
*
)
object
;
return
D3D_OK
;
}
}
static
HRESULT
WINAPI
IDirect3D9ExImpl_GetAdapterLUID
(
IDirect3D9Ex
*
iface
,
UINT
adapter
,
LUID
*
luid
)
static
HRESULT
WINAPI
IDirect3D9ExImpl_GetAdapterLUID
(
IDirect3D9Ex
*
iface
,
UINT
adapter
,
LUID
*
luid
)
...
...
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