Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 16/218: [WINESYNC] d3dx9/tests: Remove useless cast to self.
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c75e844c4c2d9f00eaa3… commit 3c75e844c4c2d9f00eaa36ebd482c536aae86637 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:25 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 9b0258f5756ed60b334ac20ca2f6e7f64eb5077e by Michael Stefaniuc <mstefani(a)winehq.org> --- modules/rostests/winetests/d3dx9_36/math.c | 2 +- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/d3dx9_36/math.c b/modules/rostests/winetests/d3dx9_36/math.c index 04977de6da2..e107637cf05 100644 --- a/modules/rostests/winetests/d3dx9_36/math.c +++ b/modules/rostests/winetests/d3dx9_36/math.c @@ -2026,7 +2026,7 @@ static void D3DXVector2Test(void) D3DXVec2TransformCoord(&gotvec, &u, &mat); expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; - D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + D3DXVec2TransformCoord(&gotvec, &gotvec, &mat); expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 19ffeb1483f..41bbab9a0e0 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481} +tags: {wine: 9b0258f5756ed60b334ac20ca2f6e7f64eb5077e}

1 0

[reactos] 15/218: [WINESYNC] d3dx9: Get rid of the ID3DXEffectImpl #define.
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed2023fc76d14db8af197… commit ed2023fc76d14db8af1978cb35a0a85a917129e8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:25 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Get rid of the ID3DXEffectImpl #define. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481 by Matteo Bruni <mbruni(a)codeweavers.com> --- dll/directx/wine/d3dx9_36/effect.c | 22 ++++++++++------------ sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index aa7d05fd269..7cfb7e6eaad 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -152,11 +152,9 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -#define ID3DXEffectImpl d3dx_effect - struct d3dx9_base_effect { - struct ID3DXEffectImpl *effect; + struct d3dx_effect *effect; UINT parameter_count; UINT technique_count; @@ -722,7 +720,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) } } -static void free_effect(struct ID3DXEffectImpl *effect) +static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); @@ -2845,7 +2843,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct @@ -2944,10 +2942,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all); -static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx_set_shader_constants(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_parameter *param, BOOL vs, BOOL update_all) { HRESULT hr, ret; @@ -2993,7 +2991,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all) { struct d3dx_parameter *param; @@ -3129,7 +3127,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas return D3D_OK; } -static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, BOOL update_all) +static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_pass *pass, BOOL update_all) { unsigned int i; HRESULT ret; @@ -6544,7 +6542,7 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool, + UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, const char *skip_constants_string) { DWORD tag, offset; @@ -6687,7 +6685,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) { @@ -6731,7 +6729,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors) { - struct ID3DXEffectImpl *object; + struct d3dx_effect *object; HRESULT hr; TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p," diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 23af5ad9978..19ffeb1483f 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: 4b85165cdc297f97a3609cfab2d64d87e435397e} +tags: {wine: d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481}

1 0

[reactos] 14/218: [WINESYNC] d3dx9: Merge the d3dx9_effect_GetDesc() helper.
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74a0f6629ea1af6d7e78f… commit 74a0f6629ea1af6d7e78f7aaf23b0fc8643f5a14 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:25 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Merge the d3dx9_effect_GetDesc() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4b85165cdc297f97a3609cfab2d64d87e435397e by Michael Stefaniuc <mstefani(a)winehq.org> --- dll/directx/wine/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 4c56c764643..aa7d05fd269 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -995,25 +995,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_desc(struct d3dx9_base_effect *base, D3DXEFFECT_DESC *desc) -{ - if (!desc) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - FIXME("partial stub!\n"); - - /* TODO: add creator and function count. */ - desc->Creator = NULL; - desc->Functions = 0; - desc->Parameters = base->parameter_count; - desc->Techniques = base->technique_count; - - return D3D_OK; -} - static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) { @@ -3423,9 +3404,21 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); - return d3dx9_base_effect_get_desc(&effect->base_effect, desc); + if (!desc) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + /* TODO: add creator and function count. */ + desc->Creator = NULL; + desc->Functions = 0; + desc->Parameters = effect->base_effect.parameter_count; + desc->Techniques = effect->base_effect.technique_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index ae717736b51..23af5ad9978 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: 715b932768d1f34815c6b0db18554e0d734bbec6} +tags: {wine: 4b85165cdc297f97a3609cfab2d64d87e435397e}

1 0

[reactos] 13/218: [WINESYNC] d3dx9: Merge the stub ID3DXBaseEffect methods.
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=280deff8dfbe9f2d1185c… commit 280deff8dfbe9f2d1185cea2316e9964b8466dd6 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:25 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Merge the stub ID3DXBaseEffect methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 715b932768d1f34815c6b0db18554e0d734bbec6 by Michael Stefaniuc <mstefani(a)winehq.org> --- dll/directx/wine/d3dx9_36/effect.c | 54 ++++++-------------------------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 9 insertions(+), 47 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index b9fa5986d3d..4c56c764643 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -1202,14 +1202,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_base_effect_get_function_desc(struct d3dx9_base_effect *base, - D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -1413,20 +1405,6 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_function(struct d3dx9_base_effect *base, UINT index) -{ - FIXME("stub!\n"); - - return NULL; -} - -static D3DXHANDLE d3dx9_base_effect_get_function_by_name(struct d3dx9_base_effect *base, const char *name) -{ - FIXME("stub!\n"); - - return NULL; -} - static UINT get_annotation_from_object(struct d3dx9_base_effect *base, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -2776,14 +2754,6 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT start, UINT end) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3490,11 +3460,9 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, shader %p, desc %p stub.\n", iface, shader, desc); - TRACE("iface %p, shader %p, desc %p.\n", iface, shader, desc); - - return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); + return E_NOTIMPL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) @@ -3573,20 +3541,16 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDL static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, index %u stub.\n", iface, index); - TRACE("iface %p, index %u.\n", iface, index); - - return d3dx9_base_effect_get_function(&effect->base_effect, index); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - - TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + FIXME("iface %p, name %s stub.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) @@ -3952,11 +3916,9 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3D static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, parameter %p, start %u, end %u stub.\n", iface, parameter, start, end); - TRACE("iface %p, parameter %p, start %u, end %u.\n", iface, parameter, start, end); - - return d3dx9_base_effect_set_array_range(&effect->base_effect, parameter, start, end); + return E_NOTIMPL; } /*** ID3DXEffect methods ***/ diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 3d9c997660a..ae717736b51 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: 612196b64c6b17d694831b92e7182afe9b2d9aca} +tags: {wine: 715b932768d1f34815c6b0db18554e0d734bbec6}

1 0

[reactos] 12/218: [WINESYNC] d3dx9: Rename the ID3DXEffect object and methods.
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da833f59a6e0e97e31989… commit da833f59a6e0e97e31989b035e5fe66588a9264a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:25 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Rename the ID3DXEffect object and methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 612196b64c6b17d694831b92e7182afe9b2d9aca by Michael Stefaniuc <mstefani(a)winehq.org> --- dll/directx/wine/d3dx9_36/effect.c | 536 ++++++++++++++++++------------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 265 insertions(+), 273 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index b2f8ecf6c2a..b9fa5986d3d 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -152,6 +152,8 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +#define ID3DXEffectImpl d3dx_effect + struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -174,7 +176,7 @@ struct d3dx9_base_effect unsigned int full_name_tmp_size; }; -struct ID3DXEffectImpl +struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; @@ -3398,13 +3400,13 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } -static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) +static inline struct d3dx_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { - return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); + return CONTAINING_RECORD(iface, struct d3dx_effect, ID3DXEffect_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx_effect_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); @@ -3421,18 +3423,18 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectImpl_AddRef(ID3DXEffect *iface) +static ULONG WINAPI d3dx_effect_AddRef(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) +static ULONG WINAPI d3dx_effect_Release(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -3447,45 +3449,46 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) } /*** ID3DXBaseEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, desc %p.\n", iface, desc); return d3dx9_base_effect_get_desc(&effect->base_effect, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetParameterDesc(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXPARAMETER_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetTechniqueDesc(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXTECHNIQUE_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); return d3dx9_base_effect_get_pass_desc(&effect->base_effect, pass, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, + D3DXFUNCTION_DESC *desc) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3494,82 +3497,81 @@ static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHA return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterByName(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterBySemantic(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *semantic) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *semantic) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechnique(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, index %u.\n", iface, index); return d3dx9_base_effect_get_technique(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechniqueByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPassByName(ID3DXEffect *iface, - D3DXHANDLE technique, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3578,7 +3580,7 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT in return d3dx9_base_effect_get_function(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3587,378 +3589,368 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, c return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, index %u.\n", iface, object, index); return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotationByName(ID3DXEffect *iface, - D3DXHANDLE object, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); } -static HRESULT WINAPI ID3DXEffectImpl_SetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT bytes) +static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, + const void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_GetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, void *data, UINT bytes) +static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) +static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) +static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_SetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const BOOL *b, UINT count) +static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, BOOL *b, UINT count) +static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) +static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) +static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_SetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const INT *n, UINT count) +static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, INT *n, UINT count) +static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) +static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) +static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const float *f, UINT count) +static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, float *f, UINT count) +static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_get_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_GetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_SetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) +static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) +static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_SetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 *texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 **texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DPixelShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DVertexShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) +static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3968,9 +3960,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) +static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, pool %p\n", This, pool); @@ -3992,9 +3984,9 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPoo return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &This->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); @@ -4012,18 +4004,18 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL return D3DERR_INVALIDCALL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) +static D3DXHANDLE WINAPI d3dx_effect_GetCurrentTechnique(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); return get_technique_handle(This->active_technique); } -static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); HRESULT ret = D3D_OK; @@ -4069,10 +4061,10 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXHANDLE *next_technique) +static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -4102,7 +4094,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; - if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + if (SUCCEEDED(d3dx_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); return D3D_OK; @@ -4220,9 +4212,9 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); BOOL ret; @@ -4235,9 +4227,9 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return ret; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) +static HRESULT WINAPI d3dx_effect_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); @@ -4287,9 +4279,9 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) +static HRESULT WINAPI d3dx_effect_BeginPass(ID3DXEffect *iface, UINT pass) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, pass %u\n", effect, pass); @@ -4311,9 +4303,9 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p.\n", iface); @@ -4325,9 +4317,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) return d3dx9_apply_pass_states(effect, effect->active_pass, FALSE); } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_EndPass(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); @@ -4342,9 +4334,9 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_End(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p.\n", iface); @@ -4374,9 +4366,9 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) +static HRESULT WINAPI d3dx_effect_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, device %p\n", This, device); @@ -4442,9 +4434,9 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; @@ -4456,18 +4448,18 @@ static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_OnResetDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) +static HRESULT WINAPI d3dx_effect_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4479,9 +4471,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) +static HRESULT WINAPI d3dx_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4497,27 +4489,27 @@ static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_EndParameterBlock(ID3DXEffect* iface) +static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return NULL; } -static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4525,9 +4517,9 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3 } #if D3DX_SDK_VERSION >= 26 -static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4535,10 +4527,10 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D } #endif -static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, - struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, + struct ID3DXEffect **effect) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p, %p): stub\n", This, device, effect); @@ -4555,8 +4547,8 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, } #if D3DX_SDK_VERSION >= 27 -static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) +static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, + UINT byte_offset, UINT bytes) { FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", iface, parameter, data, byte_offset, bytes); @@ -4568,90 +4560,90 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectImpl_QueryInterface, - ID3DXEffectImpl_AddRef, - ID3DXEffectImpl_Release, + d3dx_effect_QueryInterface, + d3dx_effect_AddRef, + d3dx_effect_Release, /*** ID3DXBaseEffect methods ***/ - ID3DXEffectImpl_GetDesc, - ID3DXEffectImpl_GetParameterDesc, - ID3DXEffectImpl_GetTechniqueDesc, - ID3DXEffectImpl_GetPassDesc, - ID3DXEffectImpl_GetFunctionDesc, - ID3DXEffectImpl_GetParameter, - ID3DXEffectImpl_GetParameterByName, - ID3DXEffectImpl_GetParameterBySemantic, - ID3DXEffectImpl_GetParameterElement, - ID3DXEffectImpl_GetTechnique, - ID3DXEffectImpl_GetTechniqueByName, - ID3DXEffectImpl_GetPass, - ID3DXEffectImpl_GetPassByName, - ID3DXEffectImpl_GetFunction, - ID3DXEffectImpl_GetFunctionByName, - ID3DXEffectImpl_GetAnnotation, - ID3DXEffectImpl_GetAnnotationByName, - ID3DXEffectImpl_SetValue, - ID3DXEffectImpl_GetValue, - ID3DXEffectImpl_SetBool, - ID3DXEffectImpl_GetBool, - ID3DXEffectImpl_SetBoolArray, - ID3DXEffectImpl_GetBoolArray, - ID3DXEffectImpl_SetInt, - ID3DXEffectImpl_GetInt, - ID3DXEffectImpl_SetIntArray, - ID3DXEffectImpl_GetIntArray, - ID3DXEffectImpl_SetFloat, - ID3DXEffectImpl_GetFloat, - ID3DXEffectImpl_SetFloatArray, - ID3DXEffectImpl_GetFloatArray, - ID3DXEffectImpl_SetVector, - ID3DXEffectImpl_GetVector, - ID3DXEffectImpl_SetVectorArray, - ID3DXEffectImpl_GetVectorArray, - ID3DXEffectImpl_SetMatrix, - ID3DXEffectImpl_GetMatrix, - ID3DXEffectImpl_SetMatrixArray, - ID3DXEffectImpl_GetMatrixArray, - ID3DXEffectImpl_SetMatrixPointerArray, - ID3DXEffectImpl_GetMatrixPointerArray, - ID3DXEffectImpl_SetMatrixTranspose, - ID3DXEffectImpl_GetMatrixTranspose, - ID3DXEffectImpl_SetMatrixTransposeArray, - ID3DXEffectImpl_GetMatrixTransposeArray, - ID3DXEffectImpl_SetMatrixTransposePointerArray, - ID3DXEffectImpl_GetMatrixTransposePointerArray, - ID3DXEffectImpl_SetString, - ID3DXEffectImpl_GetString, - ID3DXEffectImpl_SetTexture, - ID3DXEffectImpl_GetTexture, - ID3DXEffectImpl_GetPixelShader, - ID3DXEffectImpl_GetVertexShader, - ID3DXEffectImpl_SetArrayRange, + d3dx_effect_GetDesc, + d3dx_effect_GetParameterDesc, + d3dx_effect_GetTechniqueDesc, + d3dx_effect_GetPassDesc, + d3dx_effect_GetFunctionDesc, + d3dx_effect_GetParameter, + d3dx_effect_GetParameterByName, + d3dx_effect_GetParameterBySemantic, + d3dx_effect_GetParameterElement, + d3dx_effect_GetTechnique, + d3dx_effect_GetTechniqueByName, + d3dx_effect_GetPass, + d3dx_effect_GetPassByName, + d3dx_effect_GetFunction, + d3dx_effect_GetFunctionByName, + d3dx_effect_GetAnnotation, + d3dx_effect_GetAnnotationByName, + d3dx_effect_SetValue, + d3dx_effect_GetValue, + d3dx_effect_SetBool, + d3dx_effect_GetBool, + d3dx_effect_SetBoolArray, + d3dx_effect_GetBoolArray, + d3dx_effect_SetInt, + d3dx_effect_GetInt, + d3dx_effect_SetIntArray, + d3dx_effect_GetIntArray, + d3dx_effect_SetFloat, + d3dx_effect_GetFloat, + d3dx_effect_SetFloatArray, + d3dx_effect_GetFloatArray, + d3dx_effect_SetVector, + d3dx_effect_GetVector, + d3dx_effect_SetVectorArray, + d3dx_effect_GetVectorArray, + d3dx_effect_SetMatrix, + d3dx_effect_GetMatrix, + d3dx_effect_SetMatrixArray, + d3dx_effect_GetMatrixArray, + d3dx_effect_SetMatrixPointerArray, + d3dx_effect_GetMatrixPointerArray, + d3dx_effect_SetMatrixTranspose, + d3dx_effect_GetMatrixTranspose, + d3dx_effect_SetMatrixTransposeArray, + d3dx_effect_GetMatrixTransposeArray, + d3dx_effect_SetMatrixTransposePointerArray, + d3dx_effect_GetMatrixTransposePointerArray, + d3dx_effect_SetString, + d3dx_effect_GetString, + d3dx_effect_SetTexture, + d3dx_effect_GetTexture, + d3dx_effect_GetPixelShader, + d3dx_effect_GetVertexShader, + d3dx_effect_SetArrayRange, /*** ID3DXEffect methods ***/ - ID3DXEffectImpl_GetPool, - ID3DXEffectImpl_SetTechnique, - ID3DXEffectImpl_GetCurrentTechnique, - ID3DXEffectImpl_ValidateTechnique, - ID3DXEffectImpl_FindNextValidTechnique, - ID3DXEffectImpl_IsParameterUsed, - ID3DXEffectImpl_Begin, - ID3DXEffectImpl_BeginPass, - ID3DXEffectImpl_CommitChanges, - ID3DXEffectImpl_EndPass, - ID3DXEffectImpl_End, - ID3DXEffectImpl_GetDevice, - ID3DXEffectImpl_OnLostDevice, - ID3DXEffectImpl_OnResetDevice, - ID3DXEffectImpl_SetStateManager, - ID3DXEffectImpl_GetStateManager, - ID3DXEffectImpl_BeginParameterBlock, - ID3DXEffectImpl_EndParameterBlock, - ID3DXEffectImpl_ApplyParameterBlock, + d3dx_effect_GetPool, + d3dx_effect_SetTechnique, + d3dx_effect_GetCurrentTechnique, + d3dx_effect_ValidateTechnique, + d3dx_effect_FindNextValidTechnique, + d3dx_effect_IsParameterUsed, + d3dx_effect_Begin, + d3dx_effect_BeginPass, + d3dx_effect_CommitChanges, + d3dx_effect_EndPass, + d3dx_effect_End, + d3dx_effect_GetDevice, + d3dx_effect_OnLostDevice, + d3dx_effect_OnResetDevice, + d3dx_effect_SetStateManager, + d3dx_effect_GetStateManager, + d3dx_effect_BeginParameterBlock, + d3dx_effect_EndParameterBlock, + d3dx_effect_ApplyParameterBlock, #if D3DX_SDK_VERSION >= 26 - ID3DXEffectImpl_DeleteParameterBlock, + d3dx_effect_DeleteParameterBlock, #endif - ID3DXEffectImpl_CloneEffect, + d3dx_effect_CloneEffect, #if D3DX_SDK_VERSION >= 27 - ID3DXEffectImpl_SetRawValue + d3dx_effect_SetRawValue #endif }; diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 45210a2bbe7..3d9c997660a 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: 4a9fe7a8a092095420532ae734ebce9978b1e608} +tags: {wine: 612196b64c6b17d694831b92e7182afe9b2d9aca}

1 0

[reactos] 11/218: [WINESYNC] d3dx9: Simplify get_parameter_by_name().
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a939c57a86af89f76c6a… commit 0a939c57a86af89f76c6ae96cbc4dd14e1df9ad6 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:24 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Simplify get_parameter_by_name(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4a9fe7a8a092095420532ae734ebce9978b1e608 by Matteo Bruni <mbruni(a)codeweavers.com> --- dll/directx/wine/d3dx9_36/effect.c | 8 +++----- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 0f228b9c39e..b2f8ecf6c2a 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -922,7 +922,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - /* Pass / technique annotations are not in the parameters tree. */ if (parameter->full_name) { name_len = strlen(name); @@ -952,9 +951,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } + /* Pass / technique annotations are not stored in the parameters tree, + * do a linear search. */ count = parameter->member_count; - length = strcspn( name, "[.@" ); + length = strcspn( name, "[." ); part = name + length; for (i = 0; i < count; i++) @@ -973,9 +974,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, case '.': return get_parameter_by_name(base, temp_parameter, part); - case '@': - return NULL; - case '[': return get_parameter_element_by_name(base, temp_parameter, part); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 595b923bc3c..45210a2bbe7 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2} +tags: {wine: 4a9fe7a8a092095420532ae734ebce9978b1e608}

1 0

[reactos] 10/218: [WINESYNC] d3dx9/tests: Avoid using the comma operator (coccinellery).
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25cd02e501eabd5e65750… commit 25cd02e501eabd5e65750013da0e88983cfe3eae Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:24 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9/tests: Avoid using the comma operator (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2 by Michael Stefaniuc <mstefani(a)winehq.org> --- modules/rostests/winetests/d3dx9_36/math.c | 114 ++++++++++++++--------------- modules/rostests/winetests/d3dx9_36/mesh.c | 2 +- sdk/tools/winesync/d3dx9.cfg | 2 +- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/modules/rostests/winetests/d3dx9_36/math.c b/modules/rostests/winetests/d3dx9_36/math.c index 73a1a93038d..04977de6da2 100644 --- a/modules/rostests/winetests/d3dx9_36/math.c +++ b/modules/rostests/winetests/d3dx9_36/math.c @@ -218,7 +218,7 @@ static void D3DXColorTest(void) scale = 0.3f; /*_______________D3DXColorAdd________________*/ - expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; + expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f; expected.a = 0.93f; D3DXColorAdd(&got,&color1,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -230,12 +230,12 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorAdjustContrast______*/ - expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f; + expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f; expected.a = 0.93f; D3DXColorAdjustContrast(&got,&color,scale); expect_color(&expected, &got, 0); /*_______________D3DXColorAdjustSaturation______*/ - expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; + expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f; expected.a = 0.93f; D3DXColorAdjustSaturation(&got,&color,scale); expect_color(&expected, &got, 16); @@ -294,7 +294,7 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorSubtract_______________*/ - expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; + expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f; expected.a = 0.82f; D3DXColorSubtract(&got,&color,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -1143,8 +1143,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 32); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 2.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 2.0f; set_matrix(&expectedmat, 41.0f, -12.0f, -24.0f, 0.0f, @@ -1154,8 +1154,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 57.0f, -12.0f, -36.0f, 0.0f, @@ -1165,8 +1165,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 25.0f, 0.0f, -20.0f, 0.0f, @@ -1176,8 +1176,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 5.0f, -4.0f, 0.0f, 0.0f, @@ -1187,8 +1187,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 5.0f, axis.y = 2.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 5.0f; axis.y = 2.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1198,8 +1198,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1209,8 +1209,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1220,8 +1220,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1231,8 +1231,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 0.0f, axis.y = 4.0f, axis.z = 0.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 0.0f; axis.y = 4.0f; axis.z = 0.0f; set_matrix(&expectedmat, 0.0f, 0.0f, 0.0f, 0.0f, @@ -1242,8 +1242,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1253,8 +1253,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1264,8 +1264,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 3.0f, axis.y = 3.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 3.0f; axis.y = 3.0f; axis.z = 3.0f; set_matrix(&expectedmat, 3796587.0f, -1377948.0f, -1589940.0f, 0.0f, @@ -1275,8 +1275,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1265529.0f, -459316.0f, -529980.0f, 0.0f, @@ -1286,8 +1286,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 2457497.0f, -434612.0f, -1423956.0f, 0.0f, @@ -1297,8 +1297,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1787952.0f, 37056.0f, -1340964.0f, 0.0f, @@ -1308,8 +1308,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 1.0f; set_matrix(&expectedmat, 595984.0f, 12352.0f, -446988.0f, 0.0f, @@ -1319,8 +1319,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 3.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 3.0f; axis.z = 0.0f; set_matrix(&expectedmat, 150528.0f, 464352.0f, -513408.0f, 0.0f, @@ -1330,8 +1330,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 1.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 1.0f; axis.z = 0.0f; set_matrix(&expectedmat, 50176.0f, 154784.0f, -171136.0f, 0.0f, @@ -1341,8 +1341,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 0.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 0.0f; axis.z = 0.0f; set_matrix(&expectedmat, 619369.0f, -626452.0f, 88144.0f, 0.0f, @@ -1393,35 +1393,35 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneDot________________*/ expected = 42.0f; - got = D3DXPlaneDot(&plane,&vec), + got = D3DXPlaneDot(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,&vec), + got = D3DXPlaneDot(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,NULL), + got = D3DXPlaneDot(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotCoord________________*/ expected = -28.0f; - got = D3DXPlaneDotCoord(&plane,&vec), + got = D3DXPlaneDotCoord(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,&vec), + got = D3DXPlaneDotCoord(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,NULL), + got = D3DXPlaneDotCoord(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotNormal______________*/ expected = -35.0f; - got = D3DXPlaneDotNormal(&plane,&vec), + got = D3DXPlaneDotNormal(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,&vec), + got = D3DXPlaneDotNormal(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,NULL), + got = D3DXPlaneDotNormal(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneFromPointNormal_______*/ @@ -1463,7 +1463,7 @@ static void D3DXPlaneTest(void) expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); expect_plane(&expectedplane, &gotplane, 2); - nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; + nulplane.a = 0.0; nulplane.b = 0.0f; nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(&expectedplane, &gotplane, 0); @@ -1484,9 +1484,9 @@ static void D3DXQuaternionTest(void) D3DXVECTOR3 axis, expectedvec; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; - q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; + q.x = 1.0f; q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; smallq.x = 0.1f; smallq.y = 0.2f; smallq.z= 0.3f; smallq.w = 0.4f; smallr.x = 0.5f; smallr.y = 0.6f; smallr.z= 0.7f; smallr.w = 0.8f; @@ -1790,9 +1790,9 @@ static void D3DXQuaternionTest(void) expect_quaternion(&expectedquat, &gotquat, 2); /*_______________D3DXQuaternionSquadSetup___________________*/ - r.x = 1.0f, r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; + r.x = 1.0f; r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; @@ -2145,7 +2145,7 @@ static void D3DXVector3Test(void) ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3Lerp__________________________*/ - expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ; + expectedvec.x = 54.5f; expectedvec.y = 64.5f; expectedvec.z = 41.0f ; D3DXVec3Lerp(&gotvec,&u,&v,scale); expect_vec3(&expectedvec, &gotvec, 0); /* Tests the case NULL */ diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 1b0f86ef170..c9ba0b5bac5 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -86,7 +86,7 @@ static void check_floats_(int line, const char *prefix, const float *got, const equal = equal && compare(*exp, *got); exp_buffer_ptr += sprintf(exp_buffer_ptr, "%g", *exp); got_buffer_ptr += sprintf(got_buffer_ptr, "%g", *got); - exp++, got++; + exp++; got++; } ok_(__FILE__,line)(equal, "%sExpected (%s), got (%s)", prefix, exp_buffer, got_buffer); } diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 55560f4c4e3..595b923bc3c 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -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: be30aab1e21e5b6811470a351ec0d6100e6e7687} +tags: {wine: eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2}

1 0

[reactos] 09/218: [WINESYNC] d3dx9: Remove redundant "not NULL" checks (coccinellery).
by winesync 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393ec322efa348945982c… commit 393ec322efa348945982cbd3d30e5e734397bf13 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Sep 21 22:40:24 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Remove redundant "not NULL" checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id be30aab1e21e5b6811470a351ec0d6100e6e7687 by Michael Stefaniuc <mstefani(a)winehq.org> --- dll/directx/wine/d3dx9_36/effect.c | 12 +++------ sdk/tools/winesync/d3dx9.cfg | 55 +++++++++++++------------------------- 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 9a2e41ae90d..0f228b9c39e 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -952,15 +952,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - count = parameter ? parameter->member_count : base->parameter_count; + count = parameter->member_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = !parameter ? &base->parameters[i].param - : &parameter->members[i]; + temp_parameter = &parameter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -975,13 +974,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '@': - { - struct d3dx_top_level_parameter *top_param - = top_level_parameter_from_parameter(temp_parameter); + return NULL; - return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, - top_param->annotations, part); - } case '[': return get_parameter_element_by_name(base, temp_parameter, part); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index cefdb2502a3..55560f4c4e3 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -1,37 +1,18 @@ -directories: - dlls/d3dx9_24: dll/directx/wine/d3dx9_24 - dlls/d3dx9_25: dll/directx/wine/d3dx9_25 - dlls/d3dx9_26: dll/directx/wine/d3dx9_26 - dlls/d3dx9_27: dll/directx/wine/d3dx9_27 - dlls/d3dx9_28: dll/directx/wine/d3dx9_28 - dlls/d3dx9_29: dll/directx/wine/d3dx9_29 - dlls/d3dx9_30: dll/directx/wine/d3dx9_30 - dlls/d3dx9_31: dll/directx/wine/d3dx9_31 - dlls/d3dx9_32: dll/directx/wine/d3dx9_32 - dlls/d3dx9_33: dll/directx/wine/d3dx9_33 - dlls/d3dx9_34: dll/directx/wine/d3dx9_34 - dlls/d3dx9_35: dll/directx/wine/d3dx9_35 - dlls/d3dx9_36: dll/directx/wine/d3dx9_36 - dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36 - dlls/d3dx9_37: dll/directx/wine/d3dx9_37 - dlls/d3dx9_38: dll/directx/wine/d3dx9_38 - dlls/d3dx9_39: dll/directx/wine/d3dx9_39 - dlls/d3dx9_40: dll/directx/wine/d3dx9_40 - dlls/d3dx9_41: dll/directx/wine/d3dx9_41 - dlls/d3dx9_42: dll/directx/wine/d3dx9_42 - dlls/d3dx9_43: dll/directx/wine/d3dx9_43 -files: - include/d3dx9.h: sdk/include/dxsdk/d3dx9.h - include/d3dx9anim.h: sdk/include/dxsdk/d3dx9anim.h - include/d3dx9core.h: sdk/include/dxsdk/d3dx9core.h - include/d3dx9effect.h: sdk/include/dxsdk/d3dx9effect.h - include/d3dx9math.h: sdk/include/dxsdk/d3dx9math.h - include/d3dx9math.inl: sdk/include/dxsdk/d3dx9math.inl - 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: wine-4.2 +directories: {dlls/d3dx9_24: dll/directx/wine/d3dx9_24, dlls/d3dx9_25: dll/directx/wine/d3dx9_25, + dlls/d3dx9_26: dll/directx/wine/d3dx9_26, dlls/d3dx9_27: dll/directx/wine/d3dx9_27, + dlls/d3dx9_28: dll/directx/wine/d3dx9_28, dlls/d3dx9_29: dll/directx/wine/d3dx9_29, + dlls/d3dx9_30: dll/directx/wine/d3dx9_30, dlls/d3dx9_31: dll/directx/wine/d3dx9_31, + dlls/d3dx9_32: dll/directx/wine/d3dx9_32, dlls/d3dx9_33: dll/directx/wine/d3dx9_33, + dlls/d3dx9_34: dll/directx/wine/d3dx9_34, dlls/d3dx9_35: dll/directx/wine/d3dx9_35, + dlls/d3dx9_36: dll/directx/wine/d3dx9_36, dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36, + dlls/d3dx9_37: dll/directx/wine/d3dx9_37, dlls/d3dx9_38: dll/directx/wine/d3dx9_38, + dlls/d3dx9_39: dll/directx/wine/d3dx9_39, dlls/d3dx9_40: dll/directx/wine/d3dx9_40, + dlls/d3dx9_41: dll/directx/wine/d3dx9_41, dlls/d3dx9_42: dll/directx/wine/d3dx9_42, + dlls/d3dx9_43: dll/directx/wine/d3dx9_43} +files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/include/dxsdk/d3dx9anim.h, + include/d3dx9core.h: sdk/include/dxsdk/d3dx9core.h, include/d3dx9effect.h: sdk/include/dxsdk/d3dx9effect.h, + include/d3dx9math.h: sdk/include/dxsdk/d3dx9math.h, include/d3dx9math.inl: sdk/include/dxsdk/d3dx9math.inl, + 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: be30aab1e21e5b6811470a351ec0d6100e6e7687}

1 0

[reactos] 08/218: [D3DX9_xx] Reduce diff to wine
by Jérôme Gardou 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6760065ef255ff86d6392… commit 6760065ef255ff86d63920ad1e9051b9a397f97e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 21 22:40:02 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [D3DX9_xx] Reduce diff to wine --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 130 ++++++++++++++-------------- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 136 ++++++++++++++--------------- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 144 +++++++++++++++---------------- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_37/d3dx9_37.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 148 ++++++++++++++++---------------- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 138 ++++++++++++++--------------- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 138 ++++++++++++++--------------- 20 files changed, 1443 insertions(+), 1443 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index d4e741884b9..d35da61e7c4 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -20,17 +20,17 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -38,10 +38,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -69,20 +69,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -99,7 +99,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -109,10 +109,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -129,20 +129,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -163,21 +163,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -190,8 +190,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -246,7 +246,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -254,38 +254,38 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 5375c07690a..3a5d53d44aa 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -20,17 +20,17 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -38,10 +38,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -69,20 +69,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -99,7 +99,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -109,10 +109,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -129,20 +129,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -163,21 +163,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -190,8 +190,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -246,7 +246,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -254,41 +254,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index c17f97f04a9..3b1020fc161 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -18,23 +18,23 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -42,10 +42,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -167,21 +167,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -194,8 +194,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -250,7 +250,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -258,41 +258,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index c17f97f04a9..3b1020fc161 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -18,23 +18,23 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -42,10 +42,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -167,21 +167,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -194,8 +194,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -250,7 +250,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -258,41 +258,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index 5b267c14599..6b8fafcbfaf 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -18,23 +18,23 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -42,10 +42,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -167,21 +167,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -194,8 +194,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -255,7 +255,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,41 +263,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index 5b267c14599..6b8fafcbfaf 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -18,23 +18,23 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -42,10 +42,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -167,21 +167,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -194,8 +194,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -255,7 +255,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,41 +263,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index dc9ea939416..fdf5ee43b6c 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -18,23 +18,23 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -42,10 +42,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -167,21 +167,21 @@ @ stub D3DXGetTargetDescByVersion @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -194,8 +194,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -255,7 +255,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,41 +263,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index 4dec8f58d0d..ed842cdaf14 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -72,20 +72,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -102,7 +102,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -112,10 +112,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -132,20 +132,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -164,21 +164,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -191,8 +191,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -260,41 +260,41 @@ @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) @ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index 7b6d62df3e7..af5624c0592 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -72,20 +72,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -102,7 +102,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -112,10 +112,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -132,20 +132,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -164,21 +164,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -191,8 +191,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,43 +263,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index 7b6d62df3e7..af5624c0592 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -72,20 +72,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -102,7 +102,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -112,10 +112,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -132,20 +132,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -164,21 +164,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -191,8 +191,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,43 +263,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index 7b6d62df3e7..af5624c0592 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -72,20 +72,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -102,7 +102,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -112,10 +112,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -132,20 +132,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -164,21 +164,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -191,8 +191,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,43 +263,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index 7b6d62df3e7..af5624c0592 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -72,20 +72,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -102,7 +102,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -112,10 +112,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -132,20 +132,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -164,21 +164,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -191,8 +191,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -263,43 +263,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index 692321d9065..de8b12ce03b 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -73,20 +73,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -103,7 +103,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -113,10 +113,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -133,20 +133,20 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -166,21 +166,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -193,8 +193,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -254,7 +254,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -265,43 +265,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 936ae902dea..c3bd9d52a2e 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) +@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) -@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) -@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @@ -41,10 +41,10 @@ @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @@ -71,20 +71,20 @@ @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) -@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) -@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) -@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) -@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stub D3DXCreateNPatchMesh(ptr ptr) +@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stub D3DXCreatePRTBuffer(long long long ptr) +@ stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) @ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) -@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -101,7 +101,7 @@ @ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) -@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr) @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @@ -111,10 +111,10 @@ @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @@ -131,15 +131,15 @@ @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @ stdcall D3DXFloat32To16Array(ptr ptr long) -@ stdcall -stub D3DXFrameAppendChild(ptr ptr) -@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stub D3DXFrameAppendChild(ptr ptr) +@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) @ stdcall D3DXFrameFind(ptr str) -@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) -@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) +@ stub D3DXFrameNumNamedMatrices(ptr) +@ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) -@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXGenerateOutputDecl(ptr ptr) +@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -159,21 +159,21 @@ @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) -@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -186,8 +186,8 @@ @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) -@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @@ -222,7 +222,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -247,7 +247,7 @@ @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stub D3DXRectPatchSize(ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -258,43 +258,43 @@ @ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stdcall D3DXSHMultiply4(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) -@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stub D3DXSHMultiply5(ptr ptr ptr) +@ stub D3DXSHMultiply6(ptr ptr ptr) +@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) -@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) -@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) -@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) +@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stub D3DXTriPatchSize(ptr ptr ptr) +@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) +@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXValidMesh(ptr ptr ptr) -@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) +@ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 936ae902dea..c3bd9d52a2e 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -18,22 +18,22 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) +@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) ... 239 lines suppressed ...

1 0

[reactos] 07/218: [SDK/WINE] Add debugstr_a in wine/test.h
by Jérôme Gardou 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad65e645dc8177c1a3808… commit ad65e645dc8177c1a38081ab5d27358076511b6a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Sep 22 09:44:24 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [SDK/WINE] Add debugstr_a in wine/test.h --- sdk/include/reactos/wine/test.h | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h index 5eb52d80e36..8b9035adfcf 100644 --- a/sdk/include/reactos/wine/test.h +++ b/sdk/include/reactos/wine/test.h @@ -75,6 +75,7 @@ extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ); +extern const char *wine_dbgstr_an( const CHAR *str, intptr_t n ); extern const char *wine_dbgstr_guid( const GUID *guid ); extern const char *wine_dbgstr_point( const POINT *guid ); extern const char *wine_dbgstr_size( const SIZE *guid ); @@ -82,6 +83,7 @@ extern const char *wine_dbgstr_rect( const RECT *rect ); #ifdef WINETEST_USE_DBGSTR_LONGLONG extern const char *wine_dbgstr_longlong( ULONGLONG ll ); #endif +static inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); } static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -577,6 +579,61 @@ void winetest_wait_child_process( HANDLE process ) } } +const char *wine_dbgstr_an( const CHAR *str, intptr_t n ) +{ + char *dst, *res; + size_t size; + + if (!((ULONG_PTR)str >> 16)) + { + if (!str) return "(null)"; + res = get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); + return res; + } + if (n == -1) + { + const CHAR *end = str; + while (*end) end++; + n = end - str; + } + if (n < 0) n = 0; + size = 12 + min( 300, n * 5 ); + dst = res = get_temp_buffer( size ); + *dst++ = '"'; + while (n-- > 0 && dst <= res + size - 10) + { + CHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c >= ' ' && c <= 126) + *dst++ = (char)c; + else + { + *dst++ = '\\'; + sprintf(dst,"%04x",c); + dst+=4; + } + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst++ = 0; + release_temp_buffer( res, dst - res ); + return res; +} + const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) { char *dst, *res;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs