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
a442fcc9
Commit
a442fcc9
authored
May 22, 2012
by
Christian Costa
Committed by
Alexandre Julliard
May 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Implement IDirect3DRMXImpl_CreateMaterial.
parent
5b11bd8b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
d3drm.c
dlls/d3drm/d3drm.c
+17
-11
d3drm_private.h
dlls/d3drm/d3drm_private.h
+1
-0
No files found.
dlls/d3drm/d3drm.c
View file @
a442fcc9
...
...
@@ -221,13 +221,13 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateLightRGB(IDirect3DRM* iface, D3DRMLI
return
IDirect3DRM3_CreateLightRGB
(
&
This
->
IDirect3DRM3_iface
,
type
,
red
,
green
,
blue
,
Light
);
}
static
HRESULT
WINAPI
IDirect3DRMImpl_CreateMaterial
(
IDirect3DRM
*
iface
,
D3DVALUE
m
,
LPDIRECT3DRMMATERIAL
*
ppM
aterial
)
static
HRESULT
WINAPI
IDirect3DRMImpl_CreateMaterial
(
IDirect3DRM
*
iface
,
D3DVALUE
power
,
LPDIRECT3DRMMATERIAL
*
m
aterial
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM
(
iface
);
FIXME
(
"(%p/%p)->(%f,%p): stub
\n
"
,
iface
,
This
,
m
,
ppM
aterial
);
TRACE
(
"(%p/%p)->(%f,%p)
\n
"
,
iface
,
This
,
power
,
m
aterial
);
return
E_NOTIMPL
;
return
IDirect3DRM3_CreateMaterial
(
&
This
->
IDirect3DRM3_iface
,
power
,
(
LPDIRECT3DRMMATERIAL2
*
)
material
)
;
}
static
HRESULT
WINAPI
IDirect3DRMImpl_CreateDevice
(
IDirect3DRM
*
iface
,
DWORD
width
,
DWORD
height
,
LPDIRECT3DRMDEVICE
*
ppDevice
)
...
...
@@ -593,14 +593,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateLightRGB(IDirect3DRM2* iface, D3DRM
return
IDirect3DRM3_CreateLightRGB
(
&
This
->
IDirect3DRM3_iface
,
type
,
red
,
green
,
blue
,
Light
);
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_CreateMaterial
(
IDirect3DRM2
*
iface
,
D3DVALUE
m
,
LPDIRECT3DRMMATERIAL
*
ppM
aterial
)
static
HRESULT
WINAPI
IDirect3DRM2Impl_CreateMaterial
(
IDirect3DRM2
*
iface
,
D3DVALUE
power
,
LPDIRECT3DRMMATERIAL
*
m
aterial
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM2
(
iface
);
FIXME
(
"(%p/%p)->(%f,%p): stub
\n
"
,
iface
,
This
,
m
,
ppM
aterial
);
TRACE
(
"(%p/%p)->(%f,%p)
\n
"
,
iface
,
This
,
power
,
m
aterial
);
return
E_NOTIMPL
;
return
IDirect3DRM3_CreateMaterial
(
&
This
->
IDirect3DRM3_iface
,
power
,
(
LPDIRECT3DRMMATERIAL2
*
)
material
)
;
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_CreateDevice
(
IDirect3DRM2
*
iface
,
DWORD
width
,
DWORD
height
,
...
...
@@ -1036,14 +1036,20 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateLightRGB(IDirect3DRM3* iface, D3DRM
return
ret
;
}
static
HRESULT
WINAPI
IDirect3DRM3Impl_CreateMaterial
(
IDirect3DRM3
*
iface
,
D3DVALUE
m
,
LPDIRECT3DRMMATERIAL2
*
M
aterial
)
static
HRESULT
WINAPI
IDirect3DRM3Impl_CreateMaterial
(
IDirect3DRM3
*
iface
,
D3DVALUE
power
,
LPDIRECT3DRMMATERIAL2
*
m
aterial
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM3
(
iface
);
HRESULT
ret
;
FIXME
(
"(%p/%p)->(%f,%p): stub
\n
"
,
iface
,
This
,
m
,
M
aterial
);
TRACE
(
"(%p/%p)->(%f,%p)
\n
"
,
iface
,
This
,
power
,
m
aterial
);
return
E_NOTIMPL
;
ret
=
Direct3DRMMaterial_create
(
material
);
if
(
SUCCEEDED
(
ret
))
IDirect3DRMMaterial2_SetPower
(
*
material
,
power
);
return
ret
;
}
static
HRESULT
WINAPI
IDirect3DRM3Impl_CreateDevice
(
IDirect3DRM3
*
iface
,
DWORD
width
,
DWORD
height
,
...
...
dlls/d3drm/d3drm_private.h
View file @
a442fcc9
...
...
@@ -30,6 +30,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** r
HRESULT
Direct3DRMLight_create
(
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMMeshBuilder_create
(
REFIID
riid
,
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMViewport_create
(
REFIID
riid
,
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMMaterial_create
(
IDirect3DRMMaterial2
**
ret_iface
)
DECLSPEC_HIDDEN
;
HRESULT
load_mesh_data
(
IDirect3DRMMeshBuilder3
*
iface
,
LPDIRECTXFILEDATA
pData
)
DECLSPEC_HIDDEN
;
...
...
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