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

[PATCH v2 1/3] po: Update Sinhala translation.
by Isira Seneviratne March 16, 2019

March 16, 2019

1 0

[PATCH 3/3] po: Update Tamil translation.
by Isira Seneviratne March 15, 2019

March 15, 2019

2 1

[PATCH 2/3] po: Update French translation.
by Isira Seneviratne March 15, 2019

March 15, 2019

2 1

[PATCH 1/3] po: Update Sinhala translation.
by Isira Seneviratne March 15, 2019

March 15, 2019

2 1

[PATCH 1/2] user32/combo: Add more tests for listbox size
by Fabian Maurer March 15, 2019

March 15, 2019

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..b3f8486cd3 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -689,6 +689,8 @@ static void test_listbox_size(DWORD style) BOOL todo; } info_height[] = { {2, 24, FALSE}, + {2, 30, TRUE}, + {2, 40, TRUE}, {2, 41, TRUE}, {2, 42, FALSE}, {2, 50, FALSE}, -- 2.21.0

2 5

[PATCH 5/8] server: Notify client about freed object so that it may free associated kernel object.
by Jacek Caban March 15, 2019

March 15, 2019

Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-)

4 8

[PATCH v2] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart March 15, 2019

March 15, 2019

With input from Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-)

2 4

[PATCH] sti/tests: Remove useless cast to self
by Michael Stefaniuc March 15, 2019

March 15, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sti/tests/sti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 0312254e38..bda4b6dc18 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -150,7 +150,7 @@ static void test_version_flag_versus_aw(void) if (SUCCEEDED(hr)) { ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); - IUnknown_Release((IUnknown*)pUnknown); + IUnknown_Release(pUnknown); } IUnknown_Release((IUnknown*)pStiW); } -- 2.20.1

1 0

[PATCH v3] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart March 15, 2019

March 15, 2019

v3:Updated based on suggestions Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 78 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-)

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetValue() helper
by Matteo Bruni March 15, 2019

March 15, 2019

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 122 +++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb7..0dc56e24063 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - 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) { @@ -2615,10 +2551,66 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + WARN("Parameter is a sampler, returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.19.2

2 2