ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_SetString() helper.

Browse Source 
Signed-off-by: Michael Stefaniuc <[email protected]>
Signed-off-by: Matteo Bruni <[email protected]>
Signed-off-by: Alexandre Julliard <[email protected]>

wine commit id e288158dec12f4f55aea01fb1e2879c6e9a18028 by Michael Stefaniuc <[email protected]>
This commit is contained in:
winesync
2021-02-04 16:37:02 +01:00
committed by Jérôme Gardou
parent da7f239a06
commit 598c2e03b2
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/directx/wine/d3dx9_36/effect.c
+10 -17
View File
@@ -1503,22 +1503,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const char *string)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param && param->type == D3DXPT_STRING)
{
set_dirty(param);
return set_string(param->data, string);
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture)
{
@@ -3539,10 +3523,19 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if
static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));
return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string);
if (param && param->type == D3DXPT_STRING)
{
set_dirty(param);
return set_string(param->data, string);
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string)
sdk/tools/winesync/d3dx9.cfg
+1 -1
View File
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: ea45ed1751860905daa33af5e45d38cbbeadd0ad}
tags: {wine: e288158dec12f4f55aea01fb1e2879c6e9a18028}