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
Alexey Alyaev
wine
Commits
7f5a3a4d
Commit
7f5a3a4d
authored
11 years ago
by
André Zwing
Committed by
Alexandre Julliard
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error.
parent
77f22250
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/d3drm/d3drm.c
+19
-17
19 additions, 17 deletions
dlls/d3drm/d3drm.c
with
19 additions
and
17 deletions
dlls/d3drm/d3drm.c
+
19
−
17
View file @
7f5a3a4d
...
...
@@ -317,22 +317,24 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRM
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
IDirect3DRMImpl_LoadTexture
(
IDirect3DRM
*
iface
,
const
char
*
filename
,
LPDIRECT3DRMTEXTURE
*
ppTexture
)
static
HRESULT
WINAPI
IDirect3DRMImpl_LoadTexture
(
IDirect3DRM
*
iface
,
const
char
*
filename
,
LPDIRECT3DRMTEXTURE
*
Texture
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM
(
iface
);
FIXME
(
"(%p/%p)->(%s,%p): stub
\n
"
,
iface
,
This
,
filename
,
pp
Texture
);
FIXME
(
"(%p/%p)->(%s,%p): stub
\n
"
,
iface
,
This
,
filename
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRMImpl_LoadTextureFromResource
(
IDirect3DRM
*
iface
,
HRSRC
rs
,
LPDIRECT3DRMTEXTURE
*
ppTexture
)
static
HRESULT
WINAPI
IDirect3DRMImpl_LoadTextureFromResource
(
IDirect3DRM
*
iface
,
HRSRC
rs
,
LPDIRECT3DRMTEXTURE
*
Texture
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM
(
iface
);
FIXME
(
"(%p/%p)->(%p,%p): stub
\n
"
,
iface
,
This
,
rs
,
pp
Texture
);
FIXME
(
"(%p/%p)->(%p,%p): stub
\n
"
,
iface
,
This
,
rs
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRMImpl_SetSearchPath
(
IDirect3DRM
*
iface
,
LPCSTR
path
)
...
...
@@ -699,25 +701,25 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface,
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_LoadTexture
(
IDirect3DRM2
*
iface
,
const
char
*
filename
,
LPDIRECT3DRMTEXTURE2
*
pp
Texture
)
static
HRESULT
WINAPI
IDirect3DRM2Impl_LoadTexture
(
IDirect3DRM2
*
iface
,
const
char
*
filename
,
LPDIRECT3DRMTEXTURE2
*
Texture
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM2
(
iface
);
FIXME
(
"(%p/%p)->(%s,%p): stub
\n
"
,
iface
,
This
,
filename
,
pp
Texture
);
FIXME
(
"(%p/%p)->(%s,%p): stub
\n
"
,
iface
,
This
,
filename
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture2
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_LoadTextureFromResource
(
IDirect3DRM2
*
iface
,
HMODULE
hModule
,
LPCSTR
strName
,
LPCSTR
strType
,
LPDIRECT3DRMTEXTURE2
*
pp
Texture
)
LPDIRECT3DRMTEXTURE2
*
Texture
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM2
(
iface
);
FIXME
(
"(%p/%p)->(%p,%p,%p,%p): stub
\n
"
,
iface
,
This
,
hModule
,
strName
,
strType
,
pp
Texture
);
FIXME
(
"(%p/%p)->(%p,%p,%p,%p): stub
\n
"
,
iface
,
This
,
hModule
,
strName
,
strType
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture2
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRM2Impl_SetSearchPath
(
IDirect3DRM2
*
iface
,
LPCSTR
path
)
...
...
@@ -1116,18 +1118,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_LoadTexture(IDirect3DRM3* iface, const ch
FIXME
(
"(%p/%p)->(%s,%p): stub
\n
"
,
iface
,
This
,
filename
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture3
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRM3Impl_LoadTextureFromResource
(
IDirect3DRM3
*
iface
,
HMODULE
mod
,
LPCSTR
strName
,
LPCSTR
strType
,
LPDIRECT3DRMTEXTURE3
*
pp
Texture
)
LPDIRECT3DRMTEXTURE3
*
Texture
)
{
IDirect3DRMImpl
*
This
=
impl_from_IDirect3DRM3
(
iface
);
FIXME
(
"(%p/%p)->(%p,%p,%p,%p): stub
\n
"
,
iface
,
This
,
mod
,
strName
,
strType
,
pp
Texture
);
FIXME
(
"(%p/%p)->(%p,%p,%p,%p): stub
\n
"
,
iface
,
This
,
mod
,
strName
,
strType
,
Texture
);
return
E_NOTIMPL
;
return
Direct3DRMTexture_create
(
&
IID_IDirect3DRMTexture3
,
(
IUnknown
**
)
Texture
)
;
}
static
HRESULT
WINAPI
IDirect3DRM3Impl_SetSearchPath
(
IDirect3DRM3
*
iface
,
LPCSTR
path
)
...
...
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