January 2023 - Wine-Commits

Hans Leidekker : ntdll/tests: Fix some Wow64 test failures on Windows 11.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: bf48ebf2a4777f9f4fbcb00db4de91dff74f89a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf48ebf2a4777f9f4fbcb00db4de91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 18 11:21:42 2023 +0100 ntdll/tests: Fix some Wow64 test failures on Windows 11. --- dlls/ntdll/tests/wow64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index b0f5dda5804..b8f28f6215c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -662,7 +662,8 @@ static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args ) return func( func64, nb_args, args ); } -static ULONG64 main_module, ntdll_module, wow64_module, wow64cpu_module, wow64win_module; +static ULONG64 main_module, ntdll_module, wow64_module, wow64base_module, wow64con_module, + wow64cpu_module, wow64win_module; static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) { @@ -776,6 +777,8 @@ static void check_module( ULONG64 base, const WCHAR *name ) #define CHECK_MODULE(mod) if (!wcsicmp( name, L"" #mod ".dll" )) { mod ## _module = base; return; } CHECK_MODULE(ntdll); CHECK_MODULE(wow64); + CHECK_MODULE(wow64base); + CHECK_MODULE(wow64con); CHECK_MODULE(wow64cpu); CHECK_MODULE(wow64win); #undef CHECK_MODULE

1 0

Nikolay Sivov : d3dx9/tests: Add a helper to compare filled cube textures.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 809618e4cd712b92a39a1ee5c9d624bbc875f433 URL: https://gitlab.winehq.org/wine/wine/-/commit/809618e4cd712b92a39a1ee5c9d624… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 19:19:47 2022 +0300 d3dx9/tests: Add a helper to compare filled cube textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 198 ++++++++++++++++++++++-------------------- 1 file changed, 106 insertions(+), 92 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bbcca591fbe..0de29f062ed 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1362,119 +1362,133 @@ static float get_cube_coord(enum cube_coord coord, unsigned int x, unsigned int } } -static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) +static DWORD get_argb_color(D3DFORMAT format, DWORD x, DWORD y, const D3DLOCKED_RECT *lock_rect) { - IDirect3DCubeTexture9 *tex; - HRESULT hr; - D3DLOCKED_RECT lock_rect; - DWORD x, y, f, m; - DWORD v[4], e[4]; - DWORD value, expected, size, pitch; - enum cube_coord coordmap[6][3] = - { - {ONE, YCOORDINV, XCOORDINV}, - {ZERO, YCOORDINV, XCOORD}, - {XCOORD, ONE, YCOORD}, - {XCOORD, ZERO, YCOORDINV}, - {XCOORD, YCOORDINV, ONE}, - {XCOORDINV, YCOORDINV, ZERO} - }; + DWORD value, ret; + int pitch; - size = 4; - hr = IDirect3DDevice9_CreateCubeTexture(device, size, 0, 0, D3DFMT_A8R8G8B8, - D3DPOOL_MANAGED, &tex, NULL); - - if (SUCCEEDED(hr)) + switch (format) { - hr = D3DXFillCubeTexture(tex, fillfunc_cube, NULL); - ok(hr == D3D_OK, "D3DXFillCubeTexture returned %#lx, expected %#lx\n", hr, D3D_OK); + case D3DFMT_A8R8G8B8: + pitch = lock_rect->Pitch / sizeof(DWORD); + return ((DWORD *)lock_rect->pBits)[y * pitch + x]; + case D3DFMT_A1R5G5B5: + pitch = lock_rect->Pitch / sizeof(WORD); + value = ((WORD *)lock_rect->pBits)[y * pitch + x]; - for (m = 0; m < 3; m++) - { - for (f = 0; f < 6; f++) - { - hr = IDirect3DCubeTexture9_LockRect(tex, f, m, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Couldn't lock the texture, error %#lx\n", hr); - if (SUCCEEDED(hr)) - { - pitch = lock_rect.Pitch / sizeof(DWORD); - for (y = 0; y < size; y++) - { - for (x = 0; x < size; x++) - { - value = ((DWORD *)lock_rect.pBits)[y * pitch + x]; - v[0] = (value >> 24) & 0xff; - v[1] = (value >> 16) & 0xff; - v[2] = (value >> 8) & 0xff; - v[3] = value & 0xff; + ret = (value >> 15 & 0x1) << 24 + | (value >> 10 & 0x1f) << 16 + | (value >> 5 & 0x1f) << 8 + | (value & 0x1f); - e[0] = (f == 0) || (f == 1) ? - 0 : (BYTE)(255.0f / size * 2.0f + 0.5f); - e[1] = get_cube_coord(coordmap[f][0], x, y, size) / size * 255.0f + 0.5f; - e[2] = get_cube_coord(coordmap[f][1], x, y, size) / size * 255.0f + 0.5f; - e[3] = get_cube_coord(coordmap[f][2], x, y, size) / size * 255.0f + 0.5f; - expected = e[0] << 24 | e[1] << 16 | e[2] << 8 | e[3]; + return ret; - ok(color_match(v, e), - "Texel at face %lu (%lu, %lu) doesn't match: %#lx, expected %#lx\n", - f, x, y, value, expected); - } - } - IDirect3DCubeTexture9_UnlockRect(tex, f, m); - } - } - size >>= 1; - } + default: + return 0; + } +} - IDirect3DCubeTexture9_Release(tex); +static DWORD get_expected_argb_color(D3DFORMAT format, const D3DXVECTOR4 *v) +{ + switch (format) + { + case D3DFMT_A8R8G8B8: + return (BYTE)(v->w * 255 + 0.5f) << 24 + | (BYTE)(v->x * 255 + 0.5f) << 16 + | (BYTE)(v->y * 255 + 0.5f) << 8 + | (BYTE)(v->z * 255 + 0.5f); + + case D3DFMT_A1R5G5B5: + return (BYTE)(v->w + 0.5f) << 24 + | (BYTE)(v->x * 31 + 0.5f) << 16 + | (BYTE)(v->y * 31 + 0.5f) << 8 + | (BYTE)(v->z * 31 + 0.5f); + default: + return 0; } - else - skip("Failed to create texture\n"); +} - hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, - D3DPOOL_MANAGED, &tex, NULL); +#define compare_cube_texture(t,f,d) compare_cube_texture_(t,f,d,__LINE__) +static void compare_cube_texture_(IDirect3DCubeTexture9 *texture, + LPD3DXFILL3D func, BYTE diff, unsigned int line) +{ + static const enum cube_coord coordmap[6][3] = + { + {ONE, YCOORDINV, XCOORDINV}, + {ZERO, YCOORDINV, XCOORD}, + {XCOORD, ONE, YCOORD}, + {XCOORD, ZERO, YCOORDINV}, + {XCOORD, YCOORDINV, ONE}, + {XCOORDINV, YCOORDINV, ZERO} + }; - if (SUCCEEDED(hr)) + DWORD x, y, m, f, levels, size, value, expected; + D3DXVECTOR3 coord, texelsize; + D3DLOCKED_RECT lock_rect; + D3DSURFACE_DESC desc; + D3DXVECTOR4 out; + HRESULT hr; + + levels = IDirect3DCubeTexture9_GetLevelCount(texture); + + for (m = 0; m < levels; ++m) { - hr = D3DXFillCubeTexture(tex, fillfunc_cube, NULL); - ok(hr == D3D_OK, "D3DXFillTexture returned %#lx, expected %#lx\n", hr, D3D_OK); + hr = IDirect3DCubeTexture9_GetLevelDesc(texture, m, &desc); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + + size = desc.Width; + for (f = 0; f < 6; f++) { - hr = IDirect3DCubeTexture9_LockRect(tex, f, 0, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Couldn't lock the texture, error %#lx\n", hr); - if (SUCCEEDED(hr)) + texelsize.x = (f == 0) || (f == 1) ? 0.0f : 2.0f / size; + texelsize.y = (f == 2) || (f == 3) ? 0.0f : 2.0f / size; + texelsize.z = (f == 4) || (f == 5) ? 0.0f : 2.0f / size; + + hr = IDirect3DCubeTexture9_LockRect(texture, f, m, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Couldn't lock the texture, error %#lx.\n", hr); + + for (y = 0; y < size; y++) { - pitch = lock_rect.Pitch / sizeof(WORD); - for (y = 0; y < 4; y++) + for (x = 0; x < size; x++) { - for (x = 0; x < 4; x++) - { - value = ((WORD *)lock_rect.pBits)[y * pitch + x]; - v[0] = value >> 15; - v[1] = value >> 10 & 0x1f; - v[2] = value >> 5 & 0x1f; - v[3] = value & 0x1f; + coord.x = get_cube_coord(coordmap[f][0], x, y, size) / size * 2.0f - 1.0f; + coord.y = get_cube_coord(coordmap[f][1], x, y, size) / size * 2.0f - 1.0f; + coord.z = get_cube_coord(coordmap[f][2], x, y, size) / size * 2.0f - 1.0f; - e[0] = (f == 0) || (f == 1) ? - 0 : (BYTE)(1.0f / size * 2.0f + 0.5f); - e[1] = get_cube_coord(coordmap[f][0], x, y, 4) / 4 * 31.0f + 0.5f; - e[2] = get_cube_coord(coordmap[f][1], x, y, 4) / 4 * 31.0f + 0.5f; - e[3] = get_cube_coord(coordmap[f][2], x, y, 4) / 4 * 31.0f + 0.5f; - expected = e[0] << 15 | e[1] << 10 | e[2] << 5 | e[3]; + func(&out, &coord, &texelsize, NULL); - ok(color_match(v, e), - "Texel at face %lu (%lu, %lu) doesn't match: %#lx, expected %#lx\n", - f, x, y, value, expected); - } + value = get_argb_color(desc.Format, x, y, &lock_rect); + expected = get_expected_argb_color(desc.Format, &out); + + ok_(__FILE__, line)(compare_color(value, expected, diff), + "Texel at face %lu (%lu, %lu) doesn't match: %08lx, expected %08lx.\n", + f, x, y, value, expected); } - IDirect3DCubeTexture9_UnlockRect(tex, f, 0); } + IDirect3DCubeTexture9_UnlockRect(texture, f, m); } - - IDirect3DCubeTexture9_Release(tex); } - else - skip("Failed to create texture\n"); +} + +static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) +{ + IDirect3DCubeTexture9 *tex; + HRESULT hr; + + hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + hr = D3DXFillCubeTexture(tex, fillfunc_cube, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + compare_cube_texture(tex, fillfunc_cube, 1); + IDirect3DCubeTexture9_Release(tex); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, + D3DPOOL_MANAGED, &tex, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + hr = D3DXFillCubeTexture(tex, fillfunc_cube, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + compare_cube_texture(tex, fillfunc_cube, 2); + IDirect3DCubeTexture9_Release(tex); } static void WINAPI fillfunc_volume(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord,

1 0

Nikolay Sivov : d3dx9: Partially implement D3DXFillTextureTX().
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 86bc7dd10af25ebd769c44178141e8456916a849 URL: https://gitlab.winehq.org/wine/wine/-/commit/86bc7dd10af25ebd769c44178141e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 3 11:09:48 2022 +0300 d3dx9: Partially implement D3DXFillTextureTX(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/preshader.c | 10 +++++++--- dlls/d3dx9_36/shader.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/texture.c | 2 -- dlls/d3dx9_36/texture.c | 6 ------ 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index fb0d10cc0c9..ebf62a99c6a 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1728,16 +1728,20 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx HRESULT hr; unsigned int i; unsigned int elements, elements_param, elements_table; + BOOL is_dirty; float *oc; TRACE("peval %p, param %p, param_value %p.\n", peval, param, param_value); - if (is_const_tab_input_dirty(&peval->pres.inputs, ULONG64_MAX)) + if ((is_dirty = is_const_tab_input_dirty(&peval->pres.inputs, ULONG64_MAX))) { set_constants(&peval->pres.regs, &peval->pres.inputs, - next_update_version(peval->version_counter), - NULL, NULL, peval->param_type, FALSE, FALSE); + next_update_version(peval->version_counter), NULL, NULL, + peval->param_type, FALSE, FALSE); + } + if (is_dirty || peval->pres.regs.table_sizes[PRES_REGTAB_INPUT]) + { if (FAILED(hr = execute_preshader(&peval->pres))) return hr; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a776a1d9a94..3ed7bcc5b70 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "d3dx9_private.h" #include "d3dcommon.h" @@ -2615,6 +2616,15 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = d3dx9_texture_shader_SetMatrixTransposePointerArray }; +static inline struct d3dx9_texture_shader *unsafe_impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) +{ + if (!iface) + return NULL; + + assert(iface->lpVtbl == &d3dx9_texture_shader_vtbl); + return impl_from_ID3DXTextureShader(iface); +} + HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; @@ -2660,6 +2670,39 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader return D3D_OK; } +void WINAPI texture_shader_fill_2d(D3DXVECTOR4 *out, const D3DXVECTOR2 *texcoord, + const D3DXVECTOR2 *texelsize, void *data) +{ + struct d3dx9_texture_shader *shader = data; + struct d3dx_parameter param = { 0 }; + float *inputs; + + inputs = (float *)shader->eval->pres.regs.tables[PRES_REGTAB_INPUT]; + + *(inputs++) = texcoord->x; + *(inputs++) = texcoord->y; + *(inputs++) = 0.0f; + *(inputs++) = 0.0f; + + *(inputs++) = texelsize->x; + *(inputs++) = texelsize->y; + *(inputs++) = 0.0f; + *(inputs++) = 0.0f; + + param.type = D3DXPT_FLOAT; + param.bytes = 4 * sizeof(float); + d3dx_evaluate_parameter(shader->eval, &param, out); +} + +HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader) +{ + struct d3dx9_texture_shader *shader = unsafe_impl_from_ID3DXTextureShader(texture_shader); + + TRACE("texture %p, texture_shader %p.\n", texture, texture_shader); + + return D3DXFillTexture(texture, texture_shader_fill_2d, shader); +} + static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { DWORD opcode = *byte_code & 0xffff; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ee4f270078e..bbcca591fbe 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2527,7 +2527,6 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr); hr = D3DXFillTextureTX(texture, tx); - todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, D3DLOCK_READONLY); @@ -2541,7 +2540,6 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR /* The third position coordinate is apparently undefined for 2D textures. */ unsigned int color = data[y * lr.Pitch / sizeof(*data) + x] & 0xffffff00; - todo_wine ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u).\n", color, x, y); } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 46bca5eb4e6..04df331c79a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1382,12 +1382,6 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f return D3D_OK; } -HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader) -{ - FIXME("texture %p, texture_shader %p stub.\n", texture, texture_shader); - return E_NOTIMPL; -} - HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, const void *src_data, UINT src_data_size, UINT size, UINT mip_levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, DWORD filter, DWORD mip_filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info,

1 0

Nikolay Sivov : d3dx9: Fix ARGB texture fills with negative component values.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 1908d0b3857c175f832a9d382c5d0cf7ff9190e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1908d0b3857c175f832a9d382c5d0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 23:44:07 2022 +0300 d3dx9: Fix ARGB texture fills with negative component values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 30 ++++++++++++++++++++++++++---- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 0de29f062ed..b3fe62d0662 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1330,6 +1330,15 @@ static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord value->w = texelsize->x; } +static void WINAPI fillfunc_cube_coord(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, + const D3DXVECTOR3 *texelsize, void *data) +{ + value->x = texcoord->x; + value->y = texcoord->y; + value->z = texcoord->z; + value->w = 1.0f; +} + enum cube_coord { XCOORD = 0, @@ -1388,15 +1397,20 @@ static DWORD get_argb_color(D3DFORMAT format, DWORD x, DWORD y, const D3DLOCKED_ } } +static BYTE get_s8_clipped(float v) +{ + return (BYTE)(v >= 0.0f ? v * 255 + 0.5f : 0.0f); +} + static DWORD get_expected_argb_color(D3DFORMAT format, const D3DXVECTOR4 *v) { switch (format) { case D3DFMT_A8R8G8B8: - return (BYTE)(v->w * 255 + 0.5f) << 24 - | (BYTE)(v->x * 255 + 0.5f) << 16 - | (BYTE)(v->y * 255 + 0.5f) << 8 - | (BYTE)(v->z * 255 + 0.5f); + return get_s8_clipped(v->w) << 24 + | get_s8_clipped(v->x) << 16 + | get_s8_clipped(v->y) << 8 + | get_s8_clipped(v->z); case D3DFMT_A1R5G5B5: return (BYTE)(v->w + 0.5f) << 24 @@ -1475,13 +1489,21 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) IDirect3DCubeTexture9 *tex; HRESULT hr; + /* A8R8G8B8 */ hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + hr = D3DXFillCubeTexture(tex, fillfunc_cube, NULL); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); compare_cube_texture(tex, fillfunc_cube, 1); + + hr = D3DXFillCubeTexture(tex, fillfunc_cube_coord, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + compare_cube_texture(tex, fillfunc_cube_coord, 1); + IDirect3DCubeTexture9_Release(tex); + /* A1R5G5B5 */ hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 04df331c79a..def7e41070b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1288,7 +1288,7 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po else if (format->type == FORMAT_ARGBF) v = *(DWORD *)&comp_value; else if (format->type == FORMAT_ARGB) - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; + v = max(comp_value * ((1 << format->bits[c]) - 1) + 0.5f, 0); else FIXME("Unhandled format type %#x\n", format->type);

1 0

Hans Leidekker : ntdll/tests: Mark more Windows 11 test failures as broken.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 6f5578b0ca636fe18598b5b79fde516a4990aac1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f5578b0ca636fe18598b5b79fde51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 13 13:54:35 2023 +0100 ntdll/tests: Mark more Windows 11 test failures as broken. --- dlls/ntdll/tests/rtlstr.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 2aebe1deda1..8988aadeac4 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -792,6 +792,7 @@ typedef struct { int res_buf_size; const char *res_buf; NTSTATUS result; + int broken_len; } ustr2astr_t; static const ustr2astr_t ustr2astr[] = { @@ -799,7 +800,7 @@ static const ustr2astr_t ustr2astr[] = { { 10, 12, 12, "------------", 12, 12, 12, "abcdef", TRUE, 6, 7, 7, "abcdef", STATUS_SUCCESS}, { 0, 2, 12, "------------", 12, 12, 12, "abcdef", TRUE, 6, 7, 7, "abcdef", STATUS_SUCCESS}, { 10, 12, 12, NULL, 12, 12, 12, "abcdef", TRUE, 6, 7, 7, "abcdef", STATUS_SUCCESS}, - { 0, 0, 12, "------------", 12, 12, 12, "abcdef", FALSE, 6, 0, 0, "", STATUS_BUFFER_OVERFLOW}, + { 0, 0, 12, "------------", 12, 12, 12, "abcdef", FALSE, 6, 0, 0, "", STATUS_BUFFER_OVERFLOW, 1}, { 0, 1, 12, "------------", 12, 12, 12, "abcdef", FALSE, 0, 1, 1, "", STATUS_BUFFER_OVERFLOW}, { 0, 2, 12, "------------", 12, 12, 12, "abcdef", FALSE, 1, 2, 2, "a", STATUS_BUFFER_OVERFLOW}, { 0, 3, 12, "------------", 12, 12, 12, "abcdef", FALSE, 2, 3, 3, "ab", STATUS_BUFFER_OVERFLOW}, @@ -849,7 +850,8 @@ static void test_RtlUnicodeStringToAnsiString(void) ok(result == ustr2astr[test_num].result, "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) has result %lx, expected %lx\n", test_num, ustr2astr[test_num].doalloc, result, ustr2astr[test_num].result); - ok(ansi_str.Length == ustr2astr[test_num].res_Length, + ok(ansi_str.Length == ustr2astr[test_num].res_Length || + broken(ustr2astr[test_num].broken_len && !ansi_str.Length) /* win11 */, "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) ansi has Length %d, expected %d\n", test_num, ustr2astr[test_num].doalloc, ansi_str.Length, ustr2astr[test_num].res_Length); ok(ansi_str.MaximumLength == ustr2astr[test_num].res_MaximumLength, @@ -1523,6 +1525,7 @@ typedef struct { USHORT MaximumLength; const char *Buffer; NTSTATUS result; + int broken_len; } int2str_t; static const int2str_t int2str[] = { @@ -1622,11 +1625,11 @@ static const int2str_t int2str[] = { { 2, 131072, 18, 19, "100000000000000000\0----------------", STATUS_SUCCESS}, { 2, 131072, 18, 18, "100000000000000000-----------------", STATUS_SUCCESS}, {16, 0xffffffff, 8, 9, "FFFFFFFF\0--------------------------", STATUS_SUCCESS}, - {16, 0xffffffff, 8, 8, "FFFFFFFF---------------------------", STATUS_SUCCESS}, /* No \0 term */ - {16, 0xffffffff, 8, 7, "-----------------------------------", STATUS_BUFFER_OVERFLOW}, /* Too short */ + {16, 0xffffffff, 8, 8, "FFFFFFFF---------------------------", STATUS_SUCCESS, 1}, /* No \0 term */ + {16, 0xffffffff, 8, 7, "-----------------------------------", STATUS_BUFFER_OVERFLOW, 1}, /* Too short */ {16, 0xa, 1, 2, "A\0---------------------------------", STATUS_SUCCESS}, - {16, 0xa, 1, 1, "A----------------------------------", STATUS_SUCCESS}, /* No \0 term */ - {16, 0, 1, 0, "-----------------------------------", STATUS_BUFFER_OVERFLOW}, + {16, 0xa, 1, 1, "A----------------------------------", STATUS_SUCCESS, 1}, /* No \0 term */ + {16, 0, 1, 0, "-----------------------------------", STATUS_BUFFER_OVERFLOW, 1}, {20, 0xdeadbeef, 0, 9, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* ill. base */ {-8, 07654321, 0, 12, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* neg. base */ }; @@ -1687,7 +1690,8 @@ static void one_RtlIntegerToUnicodeString_test(int test_num, const int2str_t *in ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, int2str->value, int2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); - ok(unicode_string.Length == expected_unicode_string.Length, + ok(unicode_string.Length == expected_unicode_string.Length || + broken(int2str->broken_len && !unicode_string.Length) /* win11 */, "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) string has Length %d, expected: %d\n", test_num, int2str->value, int2str->base, unicode_string.Length, expected_unicode_string.Length); ok(unicode_string.MaximumLength == expected_unicode_string.MaximumLength,

1 0

Nikolay Sivov : d3dx9: Partially implement D3DXFillCubeTextureTX().
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 94da4fc44eeadb347789a528ec2f57c8c9968d05 URL: https://gitlab.winehq.org/wine/wine/-/commit/94da4fc44eeadb347789a528ec2f57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 3 21:11:55 2022 +0300 d3dx9: Partially implement D3DXFillCubeTextureTX(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 33 +++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/texture.c | 49 +------------------------------------------ dlls/d3dx9_36/texture.c | 6 ------ 3 files changed, 34 insertions(+), 54 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3ed7bcc5b70..1aa75d64dc5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2694,6 +2694,30 @@ void WINAPI texture_shader_fill_2d(D3DXVECTOR4 *out, const D3DXVECTOR2 *texcoord d3dx_evaluate_parameter(shader->eval, &param, out); } +void WINAPI texture_shader_fill_3d(D3DXVECTOR4 *out, const D3DXVECTOR3 *texcoord, + const D3DXVECTOR3 *texelsize, void *data) +{ + struct d3dx9_texture_shader *shader = data; + struct d3dx_parameter param = { 0 }; + float *inputs; + + inputs = (float *)shader->eval->pres.regs.tables[PRES_REGTAB_INPUT]; + + *(inputs++) = texcoord->x; + *(inputs++) = texcoord->y; + *(inputs++) = texcoord->z; + *(inputs++) = 0.0f; + + *(inputs++) = texelsize->x; + *(inputs++) = texelsize->y; + *(inputs++) = texelsize->z; + *(inputs++) = 0.0f; + + param.type = D3DXPT_FLOAT; + param.bytes = 4 * sizeof(float); + d3dx_evaluate_parameter(shader->eval, &param, out); +} + HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader) { struct d3dx9_texture_shader *shader = unsafe_impl_from_ID3DXTextureShader(texture_shader); @@ -2703,6 +2727,15 @@ HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTexture return D3DXFillTexture(texture, texture_shader_fill_2d, shader); } +HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, ID3DXTextureShader *texture_shader) +{ + struct d3dx9_texture_shader *shader = unsafe_impl_from_ID3DXTextureShader(texture_shader); + + TRACE("cube %p, texture_shader %p.\n", cube, texture_shader); + + return D3DXFillCubeTexture(cube, texture_shader_fill_3d, shader); +} + static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { DWORD opcode = *byte_code & 0xffff; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index b3fe62d0662..30495508ac3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2595,55 +2595,8 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr); hr = D3DXFillCubeTextureTX(cube_texture, tx); - todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr); - - for (z = 0; z < 6; ++z) - { - static const char * const mapping[6][3] = - { - {"-x", "-y", "1"}, - {"+x", "-y", "0"}, - {"+y", "1", "+x"}, - {"-y", "0", "+x"}, - {"1", "-y", "+x"}, - {"0", "-y", "-x"}, - }; - - hr = IDirect3DCubeTexture9_LockRect(cube_texture, z, 0, &lr, NULL, D3DLOCK_READONLY); - ok(SUCCEEDED(hr), "Locking texture failed, hr %#lx.\n", hr); - data = lr.pBits; - for (y = 0; y < 256; ++y) - { - for (x = 0; x < 256; ++x) - { - unsigned int color = data[y * lr.Pitch / sizeof(*data) + x]; - unsigned int expected = 0xff000000; - unsigned int i; - - for (i = 0; i < 3; ++i) - { - int component; - - if (mapping[z][i][0] == '0') - component = 0; - else if (mapping[z][i][0] == '1') - component = 255; - else - component = mapping[z][i][1] == 'x' ? x * 2 - 255 : y * 2 - 255; - if (mapping[z][i][0] == '-') - component = -component; - expected |= max(component, 0) << i * 8; - } - todo_wine - ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", - color, x, y, z); - } - } - hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, z, 0); - ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#lx.\n", hr); - } - + compare_cube_texture(cube_texture, fillfunc_cube_coord, 1); IDirect3DCubeTexture9_Release(cube_texture); if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || caps.MaxVolumeExtent < 64) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index def7e41070b..2ee79b51f79 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1723,12 +1723,6 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX return D3D_OK; } -HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *texture, ID3DXTextureShader *texture_shader) -{ - FIXME("texture %p, texture_shader %p stub.\n", texture, texture_shader); - return E_NOTIMPL; -} - HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LPD3DXFILL3D function, void *funcdata) { DWORD miplevels;

1 0

Nikolay Sivov : d3dx9: Create parameter evaluator for texture shaders.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: bd2a787df0a1dd5a3b3cbf0e6b145e10d119aa50 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd2a787df0a1dd5a3b3cbf0e6b145e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 3 10:00:55 2022 +0300 d3dx9: Create parameter evaluator for texture shaders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/effect.c | 99 +++++++++++++++++++++++-------------------- dlls/d3dx9_36/shader.c | 18 ++++++++ dlls/d3dx9_36/tests/texture.c | 32 +++++++++----- 4 files changed, 93 insertions(+), 58 deletions(-)

1 0

Nikolay Sivov : d3dx9/preshader: Set input table size for texture shaders.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: a0ed743461b0fd6a7f124770cc96f96104d58e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0ed743461b0fd6a7f124770cc96f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 3 10:00:19 2022 +0300 d3dx9/preshader: Set input table size for texture shaders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/preshader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8a7dfd76935..fb0d10cc0c9 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -144,6 +144,7 @@ static double pres_div(double *args, int n) {return 0.0;} #define FOURCC_CLIT 0x54494c43 #define FOURCC_FXLC 0x434c5846 #define FOURCC_PRSI 0x49535250 +#define FOURCC_TX_1 0x54580100 #define PRES_SIGN 0x46580000 struct op_info @@ -1110,13 +1111,15 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u struct d3dx_parameters_store *parameters) { unsigned int *p; - unsigned int i, j, const_count; + unsigned int i, j, const_count, magic; double *dconst; HRESULT hr; unsigned int saved_word; unsigned int section_size; - TRACE("Preshader version %#x.\n", *ptr & 0xffff); + magic = *ptr; + + TRACE("Preshader version %#x.\n", *ptr); if (!count) { @@ -1186,6 +1189,8 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u return D3DXERR_INVALIDDATA; } pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); + if (magic == FOURCC_TX_1) + pres->regs.table_sizes[PRES_REGTAB_INPUT] = 2; update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i)

1 0

Robert Wilhelm : vbscript: Return type mismatch for LBound(Empty) and LBound(NULL).
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 95845e9f6ebe9e7e97a0c1bebc2ee3d87105af7c URL: https://gitlab.winehq.org/wine/wine/-/commit/95845e9f6ebe9e7e97a0c1bebc2ee3… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Jan 27 11:37:10 2023 +0100 vbscript: Return type mismatch for LBound(Empty) and LBound(NULL). --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 470db2c1980..8c2e5b85982 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1184,6 +1184,9 @@ static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, case VT_VARIANT|VT_ARRAY|VT_BYREF: sa = *V_ARRAYREF(arg); break; + case VT_EMPTY: + case VT_NULL: + return MAKE_VBSERROR(VBSE_TYPE_MISMATCH); default: FIXME("arg %s not supported\n", debugstr_variant(arg)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a60fa046b69..c0ac6c56cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -292,6 +292,24 @@ Call ok(Lbound(arr2) = 0, "Lbound(x) = " & Lbound(x)) Call ok(Lbound(arr2, 1) = 0, "Lbound(x) = " & Lbound(x)) Call ok(Lbound(arr2, 2) = 0, "Lbound(x) = " & Lbound(x)) +sub testLBoundError() + on error resume next + call Err.clear() + call LBound() + call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call LBound(Empty) + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call LBound(Null) + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call LBound(arr, 1, 2) + call ok(Err.number = 450, "Err.number = " & Err.number) + if isEnglishLang then call ok(Err.description = "Wrong number of arguments or invalid property assignment", _ + "Err.description = " & Err.description) +end sub + sub testUBoundError() on error resume next call Err.clear() @@ -309,6 +327,8 @@ sub testUBoundError() if isEnglishLang then call ok(Err.description = "Wrong number of arguments or invalid property assignment", _ "Err.description = " & Err.description) end sub + +call testLBoundError() call testUBoundError() Dim newObject

1 0

Bernhard Kölbl : windows.media.speech: Allow the recognition session worker to be paused.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: c8a68f2a7a7d458bdf27913eb52f5544a618b0ec URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a68f2a7a7d458bdf27913eb52f55… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jan 3 14:26:57 2023 +0100 windows.media.speech: Allow the recognition session worker to be paused. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/recognizer.c | 41 ++++++++++++++++++++++++++++---- dlls/windows.media.speech/tests/speech.c | 4 ++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index aabfd56694a..80cf40fbef9 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -162,7 +162,7 @@ struct session struct list result_handlers; HANDLE worker_thread, worker_control_event; - BOOLEAN worker_running; + BOOLEAN worker_running, worker_paused; CRITICAL_SECTION cs; }; @@ -362,6 +362,7 @@ static HRESULT WINAPI session_StopAsync( ISpeechContinuousRecognitionSession *if thread = impl->worker_thread; impl->worker_thread = INVALID_HANDLE_VALUE; impl->worker_running = FALSE; + impl->worker_paused = FALSE; } else { @@ -401,14 +402,44 @@ static HRESULT session_pause_async( IInspectable *invoker ) static HRESULT WINAPI session_PauseAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { - FIXME("iface %p, action %p stub!\n", iface, action); - return async_action_create(NULL, session_pause_async, action); + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + HRESULT hr = S_OK; + + TRACE("iface %p, action %p.\n", iface, action); + + *action = NULL; + + if (FAILED(hr = async_action_create(NULL, session_pause_async, action))) + return hr; + + EnterCriticalSection(&impl->cs); + if (impl->worker_running) + { + impl->worker_paused = TRUE; + } + LeaveCriticalSection(&impl->cs); + + SetEvent(impl->worker_control_event); + + return hr; } static HRESULT WINAPI session_Resume( ISpeechContinuousRecognitionSession *iface ) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&impl->cs); + if (impl->worker_running) + { + impl->worker_paused = FALSE; + } + LeaveCriticalSection(&impl->cs); + + SetEvent(impl->worker_control_event); + + return S_OK; } static HRESULT WINAPI session_add_Completed( ISpeechContinuousRecognitionSession *iface, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index c358aa70927..8037b0e8354 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1798,11 +1798,11 @@ static void test_Recognition(void) IAsyncAction_Release(action2); hr = ISpeechContinuousRecognitionSession_Resume(session); - todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); /* Resume when already resumed. */ hr = ISpeechContinuousRecognitionSession_Resume(session); - todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); recog_state = 0xdeadbeef; hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state);

1 0