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
9aaa01ec
Commit
9aaa01ec
authored
Jan 04, 2012
by
André Hentschel
Committed by
Alexandre Julliard
Jan 04, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Add IDirect3DRMFrame3 interface.
parent
f14fd4ad
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
d3drm.c
dlls/d3drm/d3drm.c
+7
-4
d3drm_private.h
dlls/d3drm/d3drm_private.h
+1
-1
frame.c
dlls/d3drm/frame.c
+0
-0
d3drmobj.h
include/d3drmobj.h
+1
-0
No files found.
dlls/d3drm/d3drm.c
View file @
9aaa01ec
...
@@ -152,7 +152,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateFrame(IDirect3DRM* iface, LPDIRECT3D
...
@@ -152,7 +152,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateFrame(IDirect3DRM* iface, LPDIRECT3D
if
(
pFrameParent
)
if
(
pFrameParent
)
FIXME
(
"(%p/%p): Parent frame not yet supported
\n
"
,
iface
,
This
);
FIXME
(
"(%p/%p): Parent frame not yet supported
\n
"
,
iface
,
This
);
return
Direct3DRMFrame_create
((
IUnknown
**
)
ppFrame
);
return
Direct3DRMFrame_create
(
&
IID_IDirect3DRMFrame
,
(
IUnknown
**
)
ppFrame
);
}
}
static
HRESULT
WINAPI
IDirect3DRMImpl_CreateMesh
(
IDirect3DRM
*
iface
,
LPDIRECT3DRMMESH
*
ppMesh
)
static
HRESULT
WINAPI
IDirect3DRMImpl_CreateMesh
(
IDirect3DRM
*
iface
,
LPDIRECT3DRMMESH
*
ppMesh
)
...
@@ -519,7 +519,7 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateFrame(IDirect3DRM2* iface,
...
@@ -519,7 +519,7 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateFrame(IDirect3DRM2* iface,
if
(
pFrameParent
)
if
(
pFrameParent
)
FIXME
(
"(%p/%p): Parent frame not yet supported
\n
"
,
iface
,
This
);
FIXME
(
"(%p/%p): Parent frame not yet supported
\n
"
,
iface
,
This
);
return
Direct3DRMFrame_create
((
IUnknown
**
)
ppFrame
);
return
Direct3DRMFrame_create
(
&
IID_IDirect3DRMFrame2
,
(
IUnknown
**
)
ppFrame
);
}
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_CreateMesh
(
IDirect3DRM2
*
iface
,
LPDIRECT3DRMMESH
*
ppMesh
)
static
HRESULT
WINAPI
IDirect3DRM2Impl_CreateMesh
(
IDirect3DRM2
*
iface
,
LPDIRECT3DRMMESH
*
ppMesh
)
...
@@ -943,9 +943,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateFrame(IDirect3DRM3* iface,
...
@@ -943,9 +943,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateFrame(IDirect3DRM3* iface,
{
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM3
(
iface
);
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM3
(
iface
);
FIXME
(
"(%p/%p)->(%p,%p): stub
\n
"
,
iface
,
This
,
FrameParent
,
Frame
);
TRACE
(
"(%p/%p)->(%p,%p)
\n
"
,
iface
,
This
,
FrameParent
,
Frame
);
return
E_NOTIMPL
;
if
(
FrameParent
)
FIXME
(
"(%p/%p): Parent frame not yet supported
\n
"
,
iface
,
This
);
return
Direct3DRMFrame_create
(
&
IID_IDirect3DRMFrame3
,
(
IUnknown
**
)
Frame
);
}
}
static
HRESULT
WINAPI
IDirect3DRM3Impl_CreateMesh
(
IDirect3DRM3
*
iface
,
LPDIRECT3DRMMESH
*
Mesh
)
static
HRESULT
WINAPI
IDirect3DRM3Impl_CreateMesh
(
IDirect3DRM3
*
iface
,
LPDIRECT3DRMMESH
*
Mesh
)
...
...
dlls/d3drm/d3drm_private.h
View file @
9aaa01ec
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include "d3drm.h"
#include "d3drm.h"
HRESULT
Direct3DRM_create
(
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRM_create
(
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMFrame_create
(
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMFrame_create
(
REFIID
riid
,
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMMeshBuilder_create
(
REFIID
riid
,
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
Direct3DRMMeshBuilder_create
(
REFIID
riid
,
IUnknown
**
ppObj
)
DECLSPEC_HIDDEN
;
#endif
/* __D3DRM_PRIVATE_INCLUDED__ */
#endif
/* __D3DRM_PRIVATE_INCLUDED__ */
dlls/d3drm/frame.c
View file @
9aaa01ec
This diff is collapsed.
Click to expand it.
include/d3drmobj.h
View file @
9aaa01ec
...
@@ -1609,6 +1609,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
...
@@ -1609,6 +1609,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
STDMETHOD
(
AddChild
)(
THIS_
LPDIRECT3DRMFRAME3
child
)
PURE
;
STDMETHOD
(
AddChild
)(
THIS_
LPDIRECT3DRMFRAME3
child
)
PURE
;
STDMETHOD
(
AddLight
)(
THIS_
LPDIRECT3DRMLIGHT
)
PURE
;
STDMETHOD
(
AddLight
)(
THIS_
LPDIRECT3DRMLIGHT
)
PURE
;
STDMETHOD
(
AddMoveCallback
)(
THIS_
D3DRMFRAME3MOVECALLBACK
,
VOID
*
arg
,
DWORD
flags
)
PURE
;
STDMETHOD
(
AddMoveCallback
)(
THIS_
D3DRMFRAME3MOVECALLBACK
,
VOID
*
arg
,
DWORD
flags
)
PURE
;
STDMETHOD
(
AddTransform
)(
THIS_
D3DRMCOMBINETYPE
,
D3DRMMATRIX4D
)
PURE
;
STDMETHOD
(
AddTranslation
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
x
,
D3DVALUE
y
,
D3DVALUE
z
)
PURE
;
STDMETHOD
(
AddTranslation
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
x
,
D3DVALUE
y
,
D3DVALUE
z
)
PURE
;
STDMETHOD
(
AddScale
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
sx
,
D3DVALUE
sy
,
D3DVALUE
sz
)
PURE
;
STDMETHOD
(
AddScale
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
sx
,
D3DVALUE
sy
,
D3DVALUE
sz
)
PURE
;
STDMETHOD
(
AddRotation
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
x
,
D3DVALUE
y
,
D3DVALUE
z
,
D3DVALUE
theta
)
PURE
;
STDMETHOD
(
AddRotation
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
x
,
D3DVALUE
y
,
D3DVALUE
z
,
D3DVALUE
theta
)
PURE
;
...
...
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