March 2019 - Wine-devel - list.winehq.org

[PATCH 10/10] d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 88271406f3..356641d621 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3527,10 +3492,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (param && count <= param->element_count) + { + unsigned int i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 09/10] d3dx9: Merge the d3dx_effect_SetMatrixArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea1e06f4b9..88271406f3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3485,10 +3447,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 08/10] d3dx9: Merge the d3dx_effect_SetMatrix() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1d93e702fd..ea1e06f4b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,39 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix); - set_dirty(param); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3448,10 +3415,36 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_matrix(param, matrix); + set_dirty(param); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) -- 2.20.1

2 1

[PATCH 07/10] d3dx9: Merge the d3dx_effect_GetMatrixPointerArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 70 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 925bfb5505..1d93e702fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1632,44 +1632,6 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (param && matrix && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], matrix[i], FALSE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3591,10 +3553,40 @@ static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DX D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (!count) + return D3D_OK; + + if (param && matrix && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], matrix[i], FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 06/10] d3dx9: Merge the d3dx_effect_GetMatrixArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f6ed26360d..925bfb5505 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1597,45 +1597,6 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], &matrix[i], FALSE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3579,10 +3540,41 @@ static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], &matrix[i], FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 05/10] d3dx9: Merge the d3dx_effect_GetMatrix() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 +++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0052f172fe..f6ed26360d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1559,38 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (matrix && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix, FALSE); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3566,10 +3534,35 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); + if (matrix && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix, FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH v2 04/10] d3dx9: Merge the d3dx_effect_SetIntArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resent dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d1eaa6a767..0052f172fe 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,44 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3390,10 +3352,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) -- 2.20.1

2 1

[PATCH v2 01/10] d3dx9: Merge the d3dx_effect_GetInt() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - INT ==> int - FLOAT ==> float - Removed a comment dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 230af5bde8..5d0be346b8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1388,44 +1388,6 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT *n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && !param->element_count) - { - if (param->columns == 1 && param->rows == 1) - { - set_number(n, D3DXPT_INT, param->data, param->type); - TRACE("Returning %i\n", *n); - return D3D_OK; - } - - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) - || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - /* all components (3,4) are clamped (0,255) and put in the INT */ - *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; - if (param->columns * param->rows > 3) - { - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; - } - - TRACE("Returning %i\n", *n); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3422,10 +3384,39 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); - return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); + if (n && param && !param->element_count) + { + if (param->columns == 1 && param->rows == 1) + { + set_number(n, D3DXPT_INT, param->data, param->type); + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *n = min(max(0.0f, *((float *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI; + *n += ((int)(min(max(0.0f, *((float *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + *n += ((int)(min(max(0.0f, *((float *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (param->columns * param->rows > 3) + *n += ((int)(min(max(0.0f, *((float *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) -- 2.20.1

2 1

[PATCH] msi: Skip the special SummaryInformation stream in msi_commit_streams.
by Hans Leidekker 11 Mar '19

11 Mar '19

Avoids adding a useless table stream when called on an existing database. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/streams.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 6565b3d4c4..dae1d971c4 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -616,7 +616,10 @@ UINT msi_commit_streams( MSIDATABASE *db ) for (i = 0; i < db->num_streams; i++) { name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); + if (!strcmpW( name, szSumInfo )) continue; + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + TRACE("saving stream %s as %s\n", debugstr_w(name), debugstr_w(encname)); hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); if (SUCCEEDED( hr )) -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Support NULL type in ObReferenceObjectByHandle.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 9 ++++++++ dlls/ntoskrnl.exe/tests/driver.c | 11 ++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)

1 0