Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
9aaa01ec
Commit
9aaa01ec
authored
13 years ago
by
André Zwing
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
d3drm: Add IDirect3DRMFrame3 interface.
parent
f14fd4ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/d3drm/d3drm.c
+7
-4
7 additions, 4 deletions
dlls/d3drm/d3drm.c
dlls/d3drm/d3drm_private.h
+1
-1
1 addition, 1 deletion
dlls/d3drm/d3drm_private.h
dlls/d3drm/frame.c
+1027
-6
1027 additions, 6 deletions
dlls/d3drm/frame.c
include/d3drmobj.h
+1
-0
1 addition, 0 deletions
include/d3drmobj.h
with
1036 additions
and
11 deletions
dlls/d3drm/d3drm.c
+
7
−
4
View file @
9aaa01ec
...
...
@@ -152,7 +152,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateFrame(IDirect3DRM* iface, LPDIRECT3D
if
(
pFrameParent
)
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
)
...
...
@@ -519,7 +519,7 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateFrame(IDirect3DRM2* iface,
if
(
pFrameParent
)
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
)
...
...
@@ -943,9 +943,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateFrame(IDirect3DRM3* iface,
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM3
(
iface
);
FIXM
E
(
"(%p/%p)->(%p,%p)
: stub
\n
"
,
iface
,
This
,
FrameParent
,
Frame
);
TRAC
E
(
"(%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
)
...
...
This diff is collapsed.
Click to expand it.
dlls/d3drm/d3drm_private.h
+
1
−
1
View file @
9aaa01ec
...
...
@@ -27,7 +27,7 @@
#include
"d3drm.h"
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
;
#endif
/* __D3DRM_PRIVATE_INCLUDED__ */
This diff is collapsed.
Click to expand it.
dlls/d3drm/frame.c
+
1027
−
6
View file @
9aaa01ec
This diff is collapsed.
Click to expand it.
include/d3drmobj.h
+
1
−
0
View file @
9aaa01ec
...
...
@@ -1609,6 +1609,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
STDMETHOD
(
AddChild
)(
THIS_
LPDIRECT3DRMFRAME3
child
)
PURE
;
STDMETHOD
(
AddLight
)(
THIS_
LPDIRECT3DRMLIGHT
)
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
(
AddScale
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
sx
,
D3DVALUE
sy
,
D3DVALUE
sz
)
PURE
;
STDMETHOD
(
AddRotation
)(
THIS_
D3DRMCOMBINETYPE
,
D3DVALUE
x
,
D3DVALUE
y
,
D3DVALUE
z
,
D3DVALUE
theta
)
PURE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment