October 2012 - Wine-Commits

Józef Kucia : d3dx9: Do not try to fill textures other than ARGB in fill texture functions.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 2c19f22c8a83cf0e1dfc8932b3e30047c4382898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c19f22c8a83cf0e1dfc8932b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:28 2012 +0200 d3dx9: Do not try to fill textures other than ARGB in fill texture functions. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8aa5f97..050bb7a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1344,7 +1344,7 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1746,7 +1746,7 @@ HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1840,7 +1840,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(LPDIRECT3DVOLUMETEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL;

1 0

Józef Kucia : d3dx9/tests: Add tests for filling floating-point textures.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 15d642803bfb4dcb4cf64f840a7029257f29b362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d642803bfb4dcb4cf64f840… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:29 2012 +0200 d3dx9/tests: Add tests for filling floating-point textures. --- dlls/d3dx9_36/tests/texture.c | 124 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 997b0c3..ba3b2c7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -85,6 +85,43 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +#define ADMITTED_ERROR 0.0001f + +static inline float relative_error(float expected, float got) +{ + return expected == 0.0f ? fabs(expected - got) : fabs(1.0f - got / expected); +} + +#define expect_vec4(expected, got) expect_vec4_(__LINE__, expected, got) +static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *got) +{ + ok_(__FILE__, line)(relative_error(expected->x, got->x) < ADMITTED_ERROR + && relative_error(expected->y, got->y) < ADMITTED_ERROR + && relative_error(expected->z, got->z) < ADMITTED_ERROR + && relative_error(expected->w, got->w) < ADMITTED_ERROR, + "Expected (%f, %f, %f, %f), got (%f, %f, %f, %f)\n", + expected->x, expected->y, expected->z, expected->w, + got->x, got->y, got->z, got->w); +} + +static inline float float_16_to_32(unsigned short in) +{ + unsigned short s = (in & 0x8000); + unsigned short e = (in & 0x7C00) >> 10; + unsigned short m = in & 0x3FF; + float sgn = (s ? -1.0f : 1.0f); + + if (e == 0) + { + if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ + else return sgn * powf(2, -14.0f) * (m / 1024.0f); + } + else + { + return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); + } +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1011,6 +1048,93 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } else skip("Failed to create texture\n"); + + /* test floating-point textures */ + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A16B16G16R16F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(WORD); + for (y = 0; y < 4; y++) + { + WORD *ptr = (WORD *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = float_16_to_32(*ptr++); + got.y = float_16_to_32(*ptr++); + got.z = float_16_to_32(*ptr++); + got.w = float_16_to_32(*ptr++); + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A16B16G16R16F texture\n"); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A32B32G32R32F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(float); + for (y = 0; y < 4; y++) + { + float *ptr = (float *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = *ptr++; + got.y = *ptr++; + got.z = *ptr++; + got.w = *ptr++; + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A32B32G32R32F texture\n"); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord,

1 0

Frédéric Delanoy : cmd/tests: Add tests for NEQ comparison operator in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 8e3227c82486d85ad248c5dccb84cde9e464dc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3227c82486d85ad248c5dcc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:26 2012 +0200 cmd/tests: Add tests for NEQ comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 32 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c83393..e940b2d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -694,6 +694,11 @@ for %%i in (%STR_PARMS%) do call :EQUtest %%i AB for %%i in (%STR_PARMS%) do call :EQUtest %%i BA for %%i in (%STR_PARMS%) do call :EQUtest %%i AA if /I A EQU a echo A EQU a insensitive +for %%i in (%STR_PARMS%) do call :NEQtest %%i A +for %%i in (%STR_PARMS%) do call :NEQtest %%i B +for %%i in (%STR_PARMS%) do call :NEQtest %%i AB +for %%i in (%STR_PARMS%) do call :NEQtest %%i BA +for %%i in (%STR_PARMS%) do call :NEQtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -719,6 +724,10 @@ if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -731,6 +740,9 @@ goto :eof :EQUtest if %1 EQU %2 echo %1 EQU %2 goto :eof +:NEQtest +if %1 NEQ %2 echo %1 NEQ %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 91ad55b..c04c775 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -487,6 +487,26 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)BA EQU BA @todo_wine(a)AA EQU AA @todo_wine(a)A EQU a insensitive +(a)todo_wine@B NEQ A +(a)todo_wine@AB NEQ A +(a)todo_wine@BA NEQ A +(a)todo_wine@AA NEQ A +(a)todo_wine@A NEQ B +(a)todo_wine@AB NEQ B +(a)todo_wine@BA NEQ B +(a)todo_wine@AA NEQ B +(a)todo_wine@A NEQ AB +(a)todo_wine@B NEQ AB +(a)todo_wine@BA NEQ AB +(a)todo_wine@AA NEQ AB +(a)todo_wine@A NEQ BA +(a)todo_wine@B NEQ BA +(a)todo_wine@AB NEQ BA +(a)todo_wine@AA NEQ BA +(a)todo_wine@A NEQ AA +(a)todo_wine@B NEQ AA +(a)todo_wine@AB NEQ AA +(a)todo_wine@BA NEQ AA ------ for numbers negative numbers handled negative numbers handled @@ -519,6 +539,18 @@ also in negative form @todo_wine(a)hexa ok @todo_wine(a)string/hexa compare ok @todo_wine(a)string/hexa compare ok +(a)todo_wine@1 NEQ 0 +(a)todo_wine@10 NEQ 0 +(a)todo_wine@9 NEQ 0 +(a)todo_wine@0 NEQ 1 +(a)todo_wine@10 NEQ 1 +(a)todo_wine@9 NEQ 1 +(a)todo_wine@0 NEQ 10 +(a)todo_wine@1 NEQ 10 +(a)todo_wine@9 NEQ 10 +(a)todo_wine@0 NEQ 9 +(a)todo_wine@1 NEQ 9 +(a)todo_wine@10 NEQ 9 ------------ Testing for ------------ --- plain FOR A

1 0

Józef Kucia : d3dx9/tests: Only release a texture when it was created.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: cdc9f283fb77738af1e4c3efa47dcd5f3f974edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9f283fb77738af1e4c3efa… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:26 2012 +0200 d3dx9/tests: Only release a texture when it was created. --- dlls/d3dx9_36/tests/texture.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3c2cd95..997b0c3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -964,12 +964,12 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DTexture9_Release(tex); - hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1006,11 +1006,11 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } IDirect3DTexture9_UnlockRect(tex, 0); } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DTexture9_Release(tex); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1117,12 +1117,12 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DCubeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1162,11 +1162,11 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) IDirect3DCubeTexture9_UnlockRect(tex, f, 0); } } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DCubeTexture9_Release(tex); } static void WINAPI fillfunc_volume(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1232,12 +1232,12 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DVolumeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1277,11 +1277,11 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } IDirect3DVolumeTexture9_UnlockBox(tex, 0); } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DVolumeTexture9_Release(tex); } static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device)

1 0

Józef Kucia : d3dx9: Introduce a separate pixel format type for compressed pixel formats.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 84935d4312d094b21247e1d2dd4fcba2cbb1a082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84935d4312d094b21247e1d2d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:27 2012 +0200 d3dx9: Introduce a separate pixel format type for compressed pixel formats. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/surface.c | 29 ++++++++++------------------- dlls/d3dx9_36/util.c | 10 +++++----- dlls/d3dx9_36/volume.c | 4 +--- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index bd208f8..a7efbee 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -47,6 +47,7 @@ struct volume /* for internal use */ enum format_type { FORMAT_ARGB, /* unsigned */ + FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index daa6cfe..d49730d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -307,7 +307,7 @@ static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT hei UINT *pitch, UINT *size) { const struct pixel_format_desc *format_desc = get_format_info(format); - if (format_desc->format == D3DFMT_UNKNOWN) + if (format_desc->type == FORMAT_UNKNOWN) return E_NOTIMPL; if (format_desc->block_width != 1 || format_desc->block_height != 1) @@ -460,7 +460,11 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (FAILED(hr)) return hr; pixel_format = get_format_info(src_desc.Format); - if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; + if (pixel_format->type != FORMAT_ARGB) + { + FIXME("Unsupported pixel format %#x\n", src_desc.Format); + return E_NOTIMPL; + } file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); @@ -1028,7 +1032,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, formatdesc = get_format_info(imginfo.Format); - if (formatdesc->format == D3DFMT_UNKNOWN) + if (formatdesc->type == FORMAT_UNKNOWN) { FIXME("Unsupported pixel format\n"); hr = D3DXERR_INVALIDDATA; @@ -1676,15 +1680,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (srcformatdesc->bytes_per_pixel > 4 || destformatdesc->bytes_per_pixel > 4 - || srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1 - || destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + if (srcformatdesc->type != FORMAT_ARGB || destformatdesc->type != FORMAT_ARGB) { FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; } - if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) + if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; if ((filter & 0xf) == D3DX_FILTER_NONE) @@ -1952,7 +1954,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE src_format_desc = get_format_info(src_surface_desc.Format); dst_format_desc = get_format_info(d3d_pixel_format); - if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_surface_desc.Format, d3d_pixel_format); @@ -1960,17 +1962,6 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE goto cleanup; } - if (src_format_desc->bytes_per_pixel > 4 - || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) - { - FIXME("Format conversion missing %#x -> %#x\n", - src_surface_desc.Format, d3d_pixel_format); - hr = E_NOTIMPL; - goto cleanup; - } - size.width = width; size.height = height; size.depth = 1; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 72008a2..40972d8 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -65,11 +65,11 @@ static const struct pixel_format_desc formats[] = {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, - {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, {0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, }; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 2becba5..f773c7f 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -195,9 +195,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, { const BYTE *src_addr; - if (src_format_desc->bytes_per_pixel > 4 || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Pixel format conversion not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format);

1 0

André Hentschel : view: Buffer size of GetFileTitleW is in characters, not bytes (coverity).
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 0ca586120b7197a784a09836ae450018142320cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca586120b7197a784a09836a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:31:36 2012 +0200 view: Buffer size of GetFileTitleW is in characters, not bytes (coverity). --- programs/view/view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index d32a10b..9e60824 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -260,7 +260,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) { szFileTitle[0] = 0; - GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)); + GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); DoOpenFile(filename); UpdateWindowCaption(); } @@ -387,7 +387,7 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline[lstrlenW(cmdline) - 1] = 0; } szFileTitle[0] = 0; - GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)); + GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); DoOpenFile(cmdline); UpdateWindowCaption(); }

1 0

André Hentschel : winedbg: Buffer size includes the quotes (coverity).
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 8392a850844b30496ece3f06623099ee1171cf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8392a850844b30496ece3f066… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:42:49 2012 +0200 winedbg: Buffer size includes the quotes (coverity). --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 6c60831..4620030 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -862,7 +862,7 @@ enum dbg_start dbg_active_minidump(int argc, char* argv[]) HANDLE hFile; enum dbg_start ds = start_error_parse; const char* file = NULL; - char tmp[8 + 1 + MAX_PATH]; /* minidump <file> */ + char tmp[8 + 1 + 2 + MAX_PATH]; /* minidump "<file>" */ dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); DBG_IVAR(BreakOnDllLoad) = 0;

1 0

Christian Costa : d3drm: Fix child leak.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 5e1d854ee50a9ad885ebd9a15f7728afa2cb0447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1d854ee50a9ad885ebd9a15… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:25 2012 +0200 d3drm: Fix child leak. --- dlls/d3drm/meshbuilder.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 79b5d74..180a8a9 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1260,6 +1260,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) { hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + IDirectXFileObject_Release(child); if (FAILED(hr)) goto end; @@ -1268,6 +1269,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) goto end; } + else + { + IDirectXFileObject_Release(child); + } hr = Direct3DRMMaterial_create(&material); if (FAILED(hr)) @@ -1357,9 +1362,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) i++; } if (hr == S_OK) + { + IDirectXFileObject_Release(child); WARN("Found more sub-objects than expected\n"); + } else if (hr != DXFILEERR_NOMOREOBJECTS) + { goto end; + } hr = S_OK; } else

1 0

Piotr Caban : services: Added tests for service thread termination without setting service state to stopped .
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: afc4284d0520516ab565fdb70ae6abab23227d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc4284d0520516ab565fdb70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 15:00:47 2012 +0200 services: Added tests for service thread termination without setting service state to stopped. --- programs/services/tests/service.c | 219 +++++++++++++++++++++++++++++++----- 1 files changed, 188 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afc4284d0520516ab565f…

1 0

Jacek Caban : mshtml: Added IHTMLLocation::toString implementation.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 610ea94da5ba5ac954f7d9dc6434562f3fee85b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610ea94da5ba5ac954f7d9dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:27 2012 +0200 mshtml: Added IHTMLLocation::toString implementation. --- dlls/mshtml/htmllocation.c | 6 ++++-- dlls/mshtml/tests/htmllocation.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 3ce0978..3a978b5 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -583,8 +583,10 @@ static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, String); + + return IHTMLLocation_get_href(&This->IHTMLLocation_iface, String); } static const IHTMLLocationVtbl HTMLLocationVtbl = { diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index d314a13..8bf5517 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -129,6 +129,12 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test) "%s: expected retrieved href to be L\"%s\", was: %s\n", test->name, test->href, wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLLocation_toString(loc, &str); + ok(hres == S_OK, "%s: toString failed: 0x%08x\n", test->name, hres); + ok(str_eq_wa(str, test->href), "%s: toString returned %s, expected %s\n", + test->name, wine_dbgstr_w(str), test->href); + SysFreeString(str); } static void test_protocol(IHTMLLocation *loc, const struct location_test *test)

1 0