September 2013 - Wine-commits

Piotr Caban : msvcp60: Fix char_traits<wchar_t>::assign implementation.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: dbbe237985cdb645f9a1d0a223c62e24fa4cd6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbe237985cdb645f9a1d0a22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:50:10 2013 +0200 msvcp60: Fix char_traits<wchar_t>::assign implementation. --- dlls/msvcp60/string.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 1f64621..01b535d 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1809,9 +1809,15 @@ static MSVCP_size_t char_traits_wchar_length(const wchar_t *str) return wcslen((WCHAR*)str); } -static wchar_t* char_traits_wchar_assignn(wchar_t *str, MSVCP_size_t num, wchar_t c) +static wchar_t* char_traits_wchar_assignn(wchar_t *str, + MSVCP_size_t num, wchar_t c) { - return memset(str, c, num); + MSVCP_size_t i; + + for(i=0; i<num; i++) + str[i] = c; + + return str; } static int char_traits_wchar_compare(const wchar_t *s1,

1 0

Piotr Caban : msvcrt: Improve error handling in wcsrtombs function.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: b50833389ee2038337947e0220175920c2e36415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50833389ee2038337947e022… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:51:48 2013 +0200 msvcrt: Improve error handling in wcsrtombs function. --- dlls/msvcrt/wcs.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d1e738f..1cf2276 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -407,8 +407,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst if(!mbstr) { tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, *wcstr, -1, NULL, 0, NULL, &used_default)-1; - if(used_default) + if(!tmp || used_default) { + *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; + } return tmp; } @@ -418,8 +420,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, *wcstr, 1, buf, 3, NULL, &used_default); - if(used_default) + if(!size || used_default) { + *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; + } if(tmp+size > count) return tmp; @@ -476,6 +480,8 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, if(!mbstr && !size && wcstr) { conv = MSVCRT_wcsrtombs_l(NULL, wcstr, 0, locale); + if(conv == -1) + return *MSVCRT__errno(); if(ret) *ret = conv+1; return 0; @@ -492,7 +498,11 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, conv = count; conv = MSVCRT_wcsrtombs_l(mbstr, wcstr, conv, locale); - if(conv<size) + if(conv == -1) { + if(size) + mbstr[0] = '\0'; + return *MSVCRT__errno(); + }else if(conv < size) mbstr[conv++] = '\0'; else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) mbstr[conv-1] = '\0';

1 0

Jacek Caban : dinput.h: Added missing DI_WRITEPROTECT define.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 8555e77b0ea4138b2ef7f3894e636d0585324e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8555e77b0ea4138b2ef7f3894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 16:55:30 2013 +0200 dinput.h: Added missing DI_WRITEPROTECT define. >From mingw-w64. --- include/dinput.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 8c779c2..a714eeb 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -136,6 +136,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI_TRUNCATED ((HRESULT)0x00000008) #define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000B) #define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000C) +#define DI_WRITEPROTECT ((HRESULT)0x00000013) #define DIERR_OLDDIRECTINPUTVERSION \ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_OLD_WIN_VERSION)

1 0

Huw Davies : server: Android has struct user in asm/user.h.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 2a32d5765a1d07e07c73c727eedcf5a7db3b261c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32d5765a1d07e07c73c727e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 24 16:13:27 2013 +0100 server: Android has struct user in asm/user.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/ptrace.c | 8 +++++++- 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/configure b/configure index d1cd164..58f2579 100755 --- a/configure +++ b/configure @@ -5949,6 +5949,7 @@ for ac_header in \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/configure.ac b/configure.ac index 0fce454..1055b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,7 @@ AC_CHECK_HEADERS(\ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/include/config.h.in b/include/config.h.in index 5863d10..01e484e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -35,6 +35,9 @@ /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H +/* Define to 1 if you have the <asm/user.h> header file. */ +#undef HAVE_ASM_USER_H + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H diff --git a/server/ptrace.c b/server/ptrace.c index ed72b7d..9897a08 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -528,9 +528,15 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } -#if defined(linux) && defined(HAVE_SYS_USER_H) && (defined(__i386__) || defined(__x86_64__)) +#if defined(linux) && (defined(HAVE_SYS_USER_H) || defined(HAVE_ASM_USER_H)) \ + && (defined(__i386__) || defined(__x86_64__)) +#ifdef HAVE_SYS_USER_H #include <sys/user.h> +#endif +#ifdef HAVE_ASM_USER_H +#include <asm/user.h> +#endif /* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr))

1 0

Alexandre Julliard : configure: Build the makefile data into a temporary file instead of a shell variable.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 49645b6ff9292099690d0fb2d66fff75147da3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49645b6ff9292099690d0fb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 24 12:33:16 2013 +0200 configure: Build the makefile data into a temporary file instead of a shell variable. --- aclocal.m4 | 92 ++++++++++++++++++++++-------------------------- configure | 111 +++++++++++++++++++++++++++++---------------------------- configure.ac | 25 +++++++++---- 3 files changed, 115 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49645b6ff9292099690d0…

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 603ccca889663257ce017e4f67ee42ee7b32b008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603ccca889663257ce017e4f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:22:55 2013 +0900 gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0. --- dlls/gdiplus/tests/matrix.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index cf8f158..379a8fa 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -77,6 +77,9 @@ static void test_transform(void) GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + status = GdipTransformMatrixPoints(matrix, pts, 0); + expect(InvalidParameter, status); + status = GdipTransformMatrixPoints(matrix, pts, 10); expect(Ok, status);

1 0

Dmitry Timoshkov : gdiplus/tests: Print actual rectangle extents if the tests fail.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: fdeab06142ad6f21b43932740fa190af352ea78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeab06142ad6f21b43932740… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:23:48 2013 +0900 gdiplus/tests: Print actual rectangle extents if the tests fail. --- dlls/gdiplus/tests/region.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 3052f2e..ee6e158 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -86,7 +86,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) { rect = (const RECT *)rgn.data.Buffer; trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); - ok(EqualRect(rect, rc), "rects don't match\n"); + ok(EqualRect(rect, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rect->left, rect->top, rect->right, rect->bottom); } ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize); @@ -101,7 +103,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); } - ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); } static void test_getregiondata(void)

1 0

Stefan Dösinger : wined3d: Make format conversion functions work on volumes.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 5e89689bcd53871734736c905d537d49ba081860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e89689bcd53871734736c905… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:13 2013 +0200 wined3d: Make format conversion functions work on volumes. --- dlls/wined3d/surface.c | 3 +- dlls/wined3d/utils.c | 399 ++++++++++++++++++++++------------------ dlls/wined3d/volume.c | 7 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 228 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e89689bcd53871734736…

1 0

Stefan Dösinger : d3d9/tests: Add a volume V16U16 test .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: fe20ee1bc4afba87e4eb79237586730f3d40c80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe20ee1bc4afba87e4eb79237… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:14 2013 +0200 d3d9/tests: Add a volume V16U16 test. --- dlls/d3d9/tests/visual.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 471c0d6..d010043 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14635,6 +14635,151 @@ static void volume_dxt5_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(texture); } +static void volume_v16u16_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3D9 *d3d9; + IDirect3DVolumeTexture9 *texture; + IDirect3DPixelShader9 *shader; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + SHORT *texel; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ + 0x0000ffff /* end */ + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); + IDirect3D9_Release(d3d9); + if (FAILED(hr)) + { + skip("Volume V16U16 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); + + for (i = 0; i < 2; i++) + { + D3DPOOL pool; + + if (i) + pool = D3DPOOL_SYSTEMMEM; + else + pool = D3DPOOL_MANAGED; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + pool, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = 32767; + texel[1] = 32767; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = -32768; + texel[1] = 0; + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = -16384; + texel[1] = 16384; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = 0; + texel[1] = 0; + + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + if (i) + { + IDirect3DVolumeTexture9 *texture2; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + D3DPOOL_DEFAULT, &texture2, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, + (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(texture); + texture = texture2; + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColor(device, 120, 160); + ok (color_match(color, 0x000080ff, 2), + "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); + color = getPixelColor(device, 120, 400); + ok (color_match(color, 0x00ffffff, 2), + "Expected color 0x00ffffff, got 0x%08x, V16U16 input 32767, 32767.\n", color); + color = getPixelColor(device, 360, 160); + ok (color_match(color, 0x007f7fff, 2), + "Expected color 0x007f7fff, got 0x%08x, V16U16 input 0, 0.\n", color); + color = getPixelColor(device, 360, 400); + ok (color_match(color, 0x0040c0ff, 2), + "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + + IDirect3DVolumeTexture9_Release(texture); + } + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14712,6 +14857,7 @@ START_TEST(visual) { skip("No mipmap support\n"); } + offscreen_test(device_ptr); ds_size_test(device_ptr); alpha_test(device_ptr); @@ -14775,6 +14921,7 @@ START_TEST(visual) texdepth_test(device_ptr); texkill_test(device_ptr); x8l8v8u8_test(device_ptr); + volume_v16u16_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr);

1 0

Stefan Dösinger : d3d8/tests: Add a volume V16U16 test .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 993c977890d92e39353114ab7cd5167d56efe8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993c977890d92e39353114ab7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:15 2013 +0200 d3d8/tests: Add a volume V16U16 test. --- dlls/d3d8/tests/visual.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 744d7e5..c013c1c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4007,6 +4007,160 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } +static void volume_v16u16_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3D8 *d3d8; + IDirect3DVolumeTexture8 *texture; + DWORD shader; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + SHORT *texel; + D3DCAPS8 caps; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ + 0x0000ffff /* end */ + }; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Volume V16U16 textures are not supported, skipping test.\n"); + return; + } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No pixel shader 1.1 support, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreatePixelShader(device, shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); + + for (i = 0; i < 2; i++) + { + D3DPOOL pool; + + if (i) + pool = D3DPOOL_SYSTEMMEM; + else + pool = D3DPOOL_MANAGED; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + pool, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = 32767; + texel[1] = 32767; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = -32768; + texel[1] = 0; + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = -16384; + texel[1] = 16384; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = 0; + texel[1] = 0; + + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + if (i) + { + IDirect3DVolumeTexture8 *texture2; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + D3DPOOL_DEFAULT, &texture2); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)texture, + (IDirect3DBaseTexture8 *)texture2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture8_Release(texture); + texture = texture2; + } + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColor(device, 120, 160); + ok (color_match(color, 0x000080ff, 2), + "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); + color = getPixelColor(device, 120, 400); + ok (color_match(color, 0x00ffffff, 2), + "Expected color 0x00ffffff, got 0x%08x, V16U16 input 32767, 32767.\n", color); + color = getPixelColor(device, 360, 160); + ok (color_match(color, 0x007f7fff, 2), + "Expected color 0x007f7fff, got 0x%08x, V16U16 input 0, 0.\n", color); + color = getPixelColor(device, 360, 400); + ok (color_match(color, 0x0040c0ff, 2), + "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + + IDirect3DVolumeTexture8_Release(texture); + } + + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed delete pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -4096,6 +4250,7 @@ START_TEST(visual) resz_test(device_ptr); fog_special_test(device_ptr); volume_dxt5_test(device_ptr); + volume_v16u16_test(device_ptr); cleanup: if(device_ptr) {

1 0