August 2013 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d8/tests: Add a volume texture locking test.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: ccc1ce9fe3a4b688e6ba8a9f029eb6f65aa31bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc1ce9fe3a4b688e6ba8a9f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 27 12:36:21 2013 +0200 d3d8/tests: Add a volume texture locking test. --- dlls/d3d8/tests/device.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 28dce38..a48982e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4891,6 +4891,90 @@ done: } +static void test_volume_locking(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + HWND window; + HRESULT hr; + IDirect3DVolumeTexture8 *texture; + unsigned int i; + D3DLOCKED_BOX locked_box; + ULONG refcount; + D3DCAPS8 caps; + static const struct + { + D3DPOOL pool; + DWORD usage; + HRESULT create_hr, lock_hr; + } + tests[] = + { + { D3DPOOL_DEFAULT, 0, D3D_OK, D3DERR_INVALIDCALL }, + { D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, D3D_OK, D3D_OK }, + { D3DPOOL_SYSTEMMEM, 0, D3D_OK, D3D_OK }, + { D3DPOOL_SYSTEMMEM, D3DUSAGE_DYNAMIC, D3D_OK, D3D_OK }, + { D3DPOOL_MANAGED, 0, D3D_OK, D3D_OK }, + { D3DPOOL_MANAGED, D3DUSAGE_DYNAMIC, D3DERR_INVALIDCALL, D3D_OK }, + { D3DPOOL_SCRATCH, 0, D3D_OK, D3D_OK }, + { D3DPOOL_SCRATCH, D3DUSAGE_DYNAMIC, D3DERR_INVALIDCALL, D3D_OK }, + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("Volume textures not supported, skipping test.\n"); + goto out; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice8_CreateVolumeTexture(device, 4, 4, 4, 1, tests[i].usage, + D3DFMT_A8R8G8B8, tests[i].pool, &texture); + ok(hr == tests[i].create_hr, "Creating volume texture pool=%u, usage=%#x returned %#x, expected %#x.\n", + tests[i].pool, tests[i].usage, hr, tests[i].create_hr); + if (FAILED(hr)) + continue; + + locked_box.pBits = (void *)0xdeadbeef; + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, NULL, 0); + ok(hr == tests[i].lock_hr, "Lock returned %#x, expected %#x.\n", hr, tests[i].lock_hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + } + else + { + ok (locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); + } + IDirect3DVolumeTexture8_Release(texture); + } + +out: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4968,6 +5052,7 @@ START_TEST(device) test_swvp_buffer(); test_rtpatch(); test_npot_textures(); + test_volume_locking(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add UpdateTexture tests with volumes.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 9dcca7ba8adf3bdc306630240380ae779733165c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcca7ba8adf3bdc306630240… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 27 12:36:22 2013 +0200 d3d9/tests: Add UpdateTexture tests with volumes. --- dlls/d3d9/tests/device.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 584f827..d705e3e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6538,6 +6538,163 @@ out: DestroyWindow(window); } +static void test_update_volumetexture(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + HWND window; + HRESULT hr; + IDirect3DVolumeTexture9 *src, *dst; + unsigned int i; + D3DLOCKED_BOX locked_box; + ULONG refcount; + D3DCAPS9 caps; + static const struct + { + D3DPOOL src_pool, dst_pool; + HRESULT hr; + } + tests[] = + { + { D3DPOOL_DEFAULT, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_DEFAULT, D3D_OK }, + { D3DPOOL_SCRATCH, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + }; + static const struct + { + UINT src_size, dst_size; + UINT src_lvl, dst_lvl; + D3DFORMAT src_fmt, dst_fmt; + } + tests2[] = + { + { 8, 8, 0, 0, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 2, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 4, 0, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, /* Different level count */ + { 4, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, /* Different size */ + { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8 }, /* Different format */ + }; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("Volume textures not supported, skipping test.\n"); + goto out; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + DWORD src_usage = tests[i].src_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; + DWORD dst_usage = tests[i].dst_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 1, 1, 1, src_usage, + D3DFMT_A8R8G8B8, tests[i].src_pool, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 1, 1, 1, dst_usage, + D3DFMT_A8R8G8B8, tests[i].dst_pool, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(src, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + *((DWORD *)locked_box.pBits) = 0x11223344; + hr = IDirect3DVolumeTexture9_UnlockBox(src, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); + ok(hr == tests[i].hr, "UpdateTexture returned %#x, expected %#x, src pool %x, dst pool %u.\n", + hr, tests[i].hr, tests[i].src_pool, tests[i].dst_pool); + + if (SUCCEEDED(hr)) + { + DWORD content = *((DWORD *)locked_box.pBits); + hr = IDirect3DVolumeTexture9_LockBox(dst, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + ok(content == 0x11223344, "Dest texture contained %#x, expected 0x11223344.\n", content); + hr = IDirect3DVolumeTexture9_UnlockBox(dst, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + } + IDirect3DVolumeTexture9_Release(src); + IDirect3DVolumeTexture9_Release(dst); + } + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) + { + skip("Mipmapped volume maps not supported.\n"); + goto out; + } + + for (i = 0; i < sizeof(tests2) / sizeof(*tests2); i++) + { + hr = IDirect3DDevice9_CreateVolumeTexture(device, + tests2[i].src_size, tests2[i].src_size, tests2[i].src_size, + tests2[i].src_lvl, 0, tests2[i].src_fmt, D3DPOOL_SYSTEMMEM, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); + hr = IDirect3DDevice9_CreateVolumeTexture(device, + tests2[i].dst_size, tests2[i].dst_size, tests2[i].dst_size, + tests2[i].dst_lvl, 0, tests2[i].dst_fmt, D3DPOOL_DEFAULT, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); + + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); + if (FAILED(hr)) + todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + else + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + + IDirect3DVolumeTexture9_Release(src); + IDirect3DVolumeTexture9_Release(dst); + } + + /* As far as I can see, UpdateTexture on non-matching texture behaves like a memcpy. The raw data + * stays the same in a format change, a 2x2x1 texture is copied into the first row of a 4x4x1 texture, + * etc. I could not get it to segfault, but the nonexistent 5th pixel of a 2x2x1 texture is copied into + * pixel 1x2x1 of a 4x4x1 texture, demonstrating a read beyond the texture's end. I suspect any bad + * memory access is silently ignored by the runtime, in the kernel or on the GPU. + * + * I'm not adding tests for this behavior until an application needs it. */ + +out: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6629,6 +6786,7 @@ START_TEST(device) test_npot_textures(); test_vidmem_accounting(); test_volume_locking(); + test_update_volumetexture(); } out:

1 0

Stefan Dösinger : d3d8/tests: Add UpdateTexture tests with volumes.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 930d43be08d9d9bdc1092cf094c927494bd6d9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930d43be08d9d9bdc1092cf09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 27 12:36:23 2013 +0200 d3d8/tests: Add UpdateTexture tests with volumes. --- dlls/d3d8/tests/device.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a48982e..bf83be2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4975,6 +4975,162 @@ out: DestroyWindow(window); } +static void test_update_volumetexture(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + HWND window; + HRESULT hr; + IDirect3DVolumeTexture8 *src, *dst; + unsigned int i; + D3DLOCKED_BOX locked_box; + ULONG refcount; + D3DCAPS8 caps; + static const struct + { + D3DPOOL src_pool, dst_pool; + HRESULT hr; + } + tests[] = + { + { D3DPOOL_DEFAULT, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_DEFAULT, D3D_OK }, + { D3DPOOL_SCRATCH, D3DPOOL_DEFAULT, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_MANAGED, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL }, + + { D3DPOOL_DEFAULT, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_MANAGED, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + { D3DPOOL_SCRATCH, D3DPOOL_SCRATCH, D3DERR_INVALIDCALL }, + }; + static const struct + { + UINT src_size, dst_size; + UINT src_lvl, dst_lvl; + D3DFORMAT src_fmt, dst_fmt; + } + tests2[] = + { + { 8, 8, 0, 0, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 2, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 4, 0, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, + { 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, /* Different level count */ + { 4, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8 }, /* Different size */ + { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8 }, /* Different format */ + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("Volume textures not supported, skipping test.\n"); + goto out; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + DWORD src_usage = tests[i].src_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; + DWORD dst_usage = tests[i].dst_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 1, 1, 1, src_usage, + D3DFMT_A8R8G8B8, tests[i].src_pool, &src); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 1, 1, 1, dst_usage, + D3DFMT_A8R8G8B8, tests[i].dst_pool, &dst); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(src, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + *((DWORD *)locked_box.pBits) = 0x11223344; + hr = IDirect3DVolumeTexture8_UnlockBox(src, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); + ok(hr == tests[i].hr, "UpdateTexture returned %#x, expected %#x, src pool %x, dst pool %u.\n", + hr, tests[i].hr, tests[i].src_pool, tests[i].dst_pool); + + if (SUCCEEDED(hr)) + { + DWORD content = *((DWORD *)locked_box.pBits); + hr = IDirect3DVolumeTexture8_LockBox(dst, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + ok(content == 0x11223344, "Dest texture contained %#x, expected 0x11223344.\n", content); + hr = IDirect3DVolumeTexture8_UnlockBox(dst, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + } + IDirect3DVolumeTexture8_Release(src); + IDirect3DVolumeTexture8_Release(dst); + } + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) + { + skip("Mipmapped volume maps not supported.\n"); + goto out; + } + + for (i = 0; i < sizeof(tests2) / sizeof(*tests2); i++) + { + hr = IDirect3DDevice8_CreateVolumeTexture(device, + tests2[i].src_size, tests2[i].src_size, tests2[i].src_size, + tests2[i].src_lvl, 0, tests2[i].src_fmt, D3DPOOL_SYSTEMMEM, &src); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); + hr = IDirect3DDevice8_CreateVolumeTexture(device, + tests2[i].dst_size, tests2[i].dst_size, tests2[i].dst_size, + tests2[i].dst_lvl, 0, tests2[i].dst_fmt, D3DPOOL_DEFAULT, &dst); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); + + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); + if (FAILED(hr)) + todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + else + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + + IDirect3DVolumeTexture8_Release(src); + IDirect3DVolumeTexture8_Release(dst); + } + + /* As far as I can see, UpdateTexture on non-matching texture behaves like a memcpy. The raw data + * stays the same in a format change, a 2x2x1 texture is copied into the first row of a 4x4x1 texture, + * etc. I could not get it to segfault, but the nonexistent 5th pixel of a 2x2x1 texture is copied into + * pixel 1x2x1 of a 4x4x1 texture, demonstrating a read beyond the texture's end. I suspect any bad + * memory access is silently ignored by the runtime, in the kernel or on the GPU. + * + * I'm not adding tests for this behavior until an application needs it. */ + +out: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5053,6 +5209,7 @@ START_TEST(device) test_rtpatch(); test_npot_textures(); test_volume_locking(); + test_update_volumetexture(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add a volume sRGB test.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: c1c2f99939d386f678d49da248831ba6107c0270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c2f99939d386f678d49da24… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 27 12:36:24 2013 +0200 d3d9/tests: Add a volume sRGB test. --- dlls/d3d9/tests/visual.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b24b1f3..aeb6faf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14430,6 +14430,125 @@ static void fog_special_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } +static void volume_srgb_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3D9 *d3d9; + unsigned int i, j; + IDirect3DVolumeTexture9 *tex1, *tex2; + D3DPOOL pool; + D3DLOCKED_BOX locked_box; + D3DCOLOR color; + static const struct + { + BOOL srgb; + DWORD color; + } + tests[] = + { + /* Try toggling on and off */ + { FALSE, 0x007f7f7f }, + { TRUE, 0x00363636 }, + { FALSE, 0x007f7f7f }, + }; + static const struct + { + struct vec3 pos; + struct vec3 texcrd; + } + quad[] = + { + { {-1.0, -1.0, 0.0}, {0.0, 0.0, 0.0} }, + { { 1.0, -1.0, 0.0}, {0.0, 0.0, 0.0} }, + { {-1.0, 1.0, 0.0}, {0.0, 0.0, 0.0} }, + { { 1.0, 1.0, 0.0}, {0.0, 0.0, 0.0} }, + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_VOLUMETEXTURE, D3DFMT_A8R8G8B8); + if (hr != D3D_OK) + { + skip("D3DFMT_A8R8G8B8 volume textures with SRGBREAD not supported.\n"); + IDirect3D9_Release(d3d9); + return; + } + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op 0, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op 0, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + + for (i = 0; i < 2; i++) + { + if (!i) + pool = D3DPOOL_SYSTEMMEM; + else + pool = D3DPOOL_MANAGED; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 1, 1, 1, 0, D3DFMT_A8R8G8B8, pool, &tex1, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(tex1, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + *((DWORD *)locked_box.pBits) = 0x7f7f7f7f; + hr = IDirect3DVolumeTexture9_UnlockBox(tex1, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + + if (!i) + { + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 1, 1, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex1, (IDirect3DBaseTexture9 *)tex2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(tex1); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex2); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(tex2); + } + else + { + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex1); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(tex1); + } + + for (j = 0; j < sizeof(tests) / sizeof(*tests); j++) + { + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, tests[j].srgb); + ok(SUCCEEDED(hr), "Failed to set srgb state, 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, quad, sizeof(*quad)); + 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); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[j].color, 2), + "Expected color 0x%08x, got 0x%08x, i = %u, j = %u.\n", tests[j].color, color, i, j); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + } + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op 0, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, FALSE); + ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14608,6 +14727,7 @@ START_TEST(visual) multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr); fog_special_test(device_ptr); + volume_srgb_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Detlef Riekenberg : comdlg32/tests: Handle result from broken drivers.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 8e56b8332ed180515f03d6fead300a4692e5d375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e56b8332ed180515f03d6fea… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 26 21:29:30 2013 +0200 comdlg32/tests: Handle result from broken drivers. --- dlls/comdlg32/tests/printdlg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index d0b0443..7212dc4 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -257,7 +257,9 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 123 || broken(pDlg->nCopies == 1), "expected nCopies 123, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); + /* some broken drivers use always PD_USEDEVMODECOPIES */ + ok((S1(U1(*dm)).dmCopies == 1) || broken(S1(U1(*dm)).dmCopies == 123), + "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Dmitry Timoshkov : ntdll: Ignore ioctl(TIOCGICOUNT) failures.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 1202c14e6efbf53ffd90ab7c6797e063b795451b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202c14e6efbf53ffd90ab7c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 27 17:38:23 2013 +0900 ntdll: Ignore ioctl(TIOCGICOUNT) failures. Most USB-serial Linux drivers don't support it. --- dlls/ntdll/serial.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index f4ab212..91e7230 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -820,12 +820,11 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { TRACE("TIOCGICOUNT err %s\n", strerror(errno)); memset(irq_info,0, sizeof(serial_irq_info)); - return FILE_GetNtStatus(); } #else memset(irq_info,0, sizeof(serial_irq_info)); - return STATUS_NOT_IMPLEMENTED; #endif + irq_info->temt = 0; /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ #ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */

1 0

Dmitry Timoshkov : ntdll: Fallback to ioctl(TIOCOUTQ) if ioctl( TIOCSERGETLSR) fails.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: e3dcdadaca4ff620ab55b4542af27ada6d2db819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dcdadaca4ff620ab55b4542… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 27 17:40:17 2013 +0900 ntdll: Fallback to ioctl(TIOCOUTQ) if ioctl(TIOCSERGETLSR) fails. Most Linux USB-serial drivers don't support TIOCSERGETLSR. --- dlls/ntdll/serial.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 91e7230..bb025cf 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -828,12 +828,12 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) irq_info->temt = 0; /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ #ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */ - if (ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) - { - TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); - return FILE_GetNtStatus(); - } -#elif defined(TIOCOUTQ) /* otherwise we log when the out queue gets empty */ + if (!ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) + return STATUS_SUCCESS; + + TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); +#endif +#ifdef TIOCOUTQ /* otherwise we log when the out queue gets empty */ if (ioctl(fd, TIOCOUTQ, &irq_info->temt)) { TRACE("TIOCOUTQ err %s\n", strerror(errno));

1 0

Dmitry Timoshkov : ntdll: Properly test line status register for TIOCSER_TEMT bit.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: d21b05b06d019ee351a1feb4cd8f6e006a19f460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21b05b06d019ee351a1feb4c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 27 17:41:10 2013 +0900 ntdll: Properly test line status register for TIOCSER_TEMT bit. --- dlls/ntdll/serial.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index bb025cf..7f56cb5 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -804,6 +804,8 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { + int out; + #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCGICOUNT) struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -828,8 +830,11 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) irq_info->temt = 0; /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ #ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */ - if (!ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) + if (!ioctl(fd, TIOCSERGETLSR, &out)) + { + irq_info->temt = (out & TIOCSER_TEMT) != 0; return STATUS_SUCCESS; + } TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); #endif

1 0

Alexandre Julliard : server: Add a structure to pass the parameters of a select request.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: c2ab7a625e5728977668688a66c4e0b7eaa14c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ab7a625e5728977668688a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:34:11 2013 +0200 server: Add a structure to pass the parameters of a select request. --- dlls/ntdll/sync.c | 7 +++-- include/wine/server_protocol.h | 20 +++++++++++++++- server/protocol.def | 18 ++++++++++++++- server/thread.c | 34 ++++++++++++++++++++++------- server/trace.c | 46 +++++++++++++++++++++++++++++++++------- 5 files changed, 103 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2e6ffdf..89f6ee6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1109,18 +1109,19 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) { + select_op_t select_op; NTSTATUS ret; UINT i; int cookie; BOOL user_apc = FALSE; - obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0; apc_call_t call; apc_result_t result; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; memset( &result, 0, sizeof(result) ); - for (i = 0; i < count; i++) obj_handles[i] = wine_server_obj_handle( handles[i] ); + select_op.wait.op = SELECT_WAIT; + for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); for (;;) { @@ -1132,7 +1133,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN req->prev_apc = apc_handle; req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, obj_handles, count * sizeof(*obj_handles) ); + wine_server_add_data( req, &select_op, offsetof( select_op_t, wait.handles[count] )); ret = wine_server_call( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98835b2..590bd81 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -404,6 +404,22 @@ struct token_groups }; +enum select_op +{ + SELECT_NONE, + SELECT_WAIT +}; + +typedef union +{ + enum select_op op; + struct + { + enum select_op op; + obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + } wait; +} select_op_t; + enum apc_type { APC_NONE, @@ -1056,7 +1072,7 @@ struct select_request obj_handle_t prev_apc; timeout_t timeout; /* VARARG(result,apc_result); */ - /* VARARG(handles,handles); */ + /* VARARG(data,select_op); */ }; struct select_reply { @@ -5771,6 +5787,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 443 +#define SERVER_PROTOCOL_VERSION 444 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6748e5d..4601942 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -420,6 +420,22 @@ struct token_groups /* VARARG(sids,SID); */ }; +enum select_op +{ + SELECT_NONE, + SELECT_WAIT +}; + +typedef union +{ + enum select_op op; + struct + { + enum select_op op; /* SELECT_WAIT */ + obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + } wait; +} select_op_t; + enum apc_type { APC_NONE, @@ -924,7 +940,7 @@ struct rawinput_device obj_handle_t prev_apc; /* handle to previous APC */ timeout_t timeout; /* timeout */ VARARG(result,apc_result); /* result of previous APC */ - VARARG(handles,handles); /* handles to select on */ + VARARG(data,select_op); /* operation-specific data */ @REPLY timeout_t timeout; /* timeout converted to absolute */ apc_call_t call; /* APC call arguments */ diff --git a/server/thread.c b/server/thread.c index 5f9738d..c6eeaf9 100644 --- a/server/thread.c +++ b/server/thread.c @@ -710,23 +710,39 @@ static int signal_object( obj_handle_t handle ) } /* select on a list of handles */ -static timeout_t select_on( unsigned int count, client_ptr_t cookie, const obj_handle_t *handles, +static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, client_ptr_t cookie, int flags, timeout_t timeout, obj_handle_t signal_obj ) { int ret; - unsigned int i; + unsigned int i, count; struct object *objects[MAXIMUM_WAIT_OBJECTS]; if (timeout <= 0) timeout = current_time - timeout; - if (count > MAXIMUM_WAIT_OBJECTS) + switch (select_op->op) { + case SELECT_NONE: + count = 0; + break; + + case SELECT_WAIT: + count = (op_size - offsetof( select_op_t, wait.handles )) / sizeof(select_op->wait.handles[0]); + if (op_size < offsetof( select_op_t, wait.handles ) || count > MAXIMUM_WAIT_OBJECTS) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + break; + + default: set_error( STATUS_INVALID_PARAMETER ); return 0; } + for (i = 0; i < count; i++) { - if (!(objects[i] = get_handle_obj( current->process, handles[i], SYNCHRONIZE, NULL ))) + if (!(objects[i] = get_handle_obj( current->process, select_op->wait.handles[i], + SYNCHRONIZE, NULL ))) break; } @@ -1310,17 +1326,19 @@ DECL_HANDLER(resume_thread) /* select on a handle list */ DECL_HANDLER(select) { + select_op_t select_op; + data_size_t op_size; struct thread_apc *apc; - unsigned int count; const apc_result_t *result = get_req_data(); - const obj_handle_t *handles = (const obj_handle_t *)(result + 1); if (get_req_data_size() < sizeof(*result)) { set_error( STATUS_INVALID_PARAMETER ); return; } - count = (get_req_data_size() - sizeof(*result)) / sizeof(obj_handle_t); + op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); + memset( &select_op, 0, sizeof(select_op) ); + memcpy( &select_op, result + 1, op_size ); /* first store results of previous apc */ if (req->prev_apc) @@ -1348,7 +1366,7 @@ DECL_HANDLER(select) release_object( apc ); } - reply->timeout = select_on( count, req->cookie, handles, req->flags, req->timeout, req->signal ); + reply->timeout = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout, req->signal ); if (get_error() == STATUS_USER_APC) { diff --git a/server/trace.c b/server/trace.c index 7740545..c9af74f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -66,6 +66,19 @@ static void dump_uints( const int *ptr, int len ) fputc( '}', stderr ); } +static void dump_handles( const char *prefix, const obj_handle_t *data, data_size_t size ) +{ + data_size_t len = size / sizeof(*data); + + fprintf( stderr,"%s{", prefix ); + while (len > 0) + { + fprintf( stderr, "%04x", *data++ ); + if (--len) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + static void dump_timeout( const char *prefix, const timeout_t *time ) { fprintf( stderr, "%s%s", prefix, get_timeout_str(*time) ); @@ -367,16 +380,33 @@ static void dump_varargs_apc_result( const char *prefix, data_size_t size ) remove_data( size ); } -static void dump_varargs_handles( const char *prefix, data_size_t size ) +static void dump_varargs_select_op( const char *prefix, data_size_t size ) { - const obj_handle_t *data = cur_data; - data_size_t len = size / sizeof(*data); + select_op_t data; - fprintf( stderr,"%s{", prefix ); - while (len > 0) + if (!size) { - fprintf( stderr, "%04x", *data++ ); - if (--len) fputc( ',', stderr ); + fprintf( stderr, "%s{}", prefix ); + return; + } + memset( &data, 0, sizeof(data) ); + memcpy( &data, cur_data, min( size, sizeof(data) )); + + fprintf( stderr, "%s{", prefix ); + switch (data.op) + { + case SELECT_NONE: + fprintf( stderr, "NONE" ); + break; + case SELECT_WAIT: + fprintf( stderr, "WAIT" ); + if (size > offsetof( select_op_t, wait.handles )) + dump_handles( ",handles=", data.wait.handles, + min( size, sizeof(data.wait) ) - offsetof( select_op_t, wait.handles )); + break; + default: + fprintf( stderr, "op=%u", data.op ); + break; } fputc( '}', stderr ); remove_data( size ); @@ -1361,7 +1391,7 @@ static void dump_select_request( const struct select_request *req ) fprintf( stderr, ", prev_apc=%04x", req->prev_apc ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_apc_result( ", result=", cur_size ); - dump_varargs_handles( ", handles=", cur_size ); + dump_varargs_select_op( ", data=", cur_size ); } static void dump_select_reply( const struct select_reply *req )

1 0

Alexandre Julliard : ntdll: Pass a select operation structure to NTDLL_wait_for_multiple_objects.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: cbdc0ec72d917334059dd1ab0d17375594442aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc0ec72d917334059dd1ab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:53:45 2013 +0200 ntdll: Pass a select operation structure to NTDLL_wait_for_multiple_objects. --- dlls/ntdll/critsection.c | 5 ++++- dlls/ntdll/exception.c | 13 ++++++++----- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/sync.c | 22 ++++++++++++---------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index dcc66e0..6f0b5d5 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -230,9 +230,12 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; + select_op_t select_op; time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NTDLL_wait_for_multiple_objects( 1, &sem, 0, &time, 0 ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = wine_server_obj_handle( sem ); + ret = NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time, 0 ); } return ret; } diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index faa9e0d..99fac41 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -81,7 +81,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE, &timeout, 0 ); + NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE, &timeout, 0 ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -105,9 +105,10 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con { NTSTATUS ret; DWORD i; - HANDLE handle = 0; + obj_handle_t handle = 0; client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS]; context_t server_context; + select_op_t select_op; if (!NtCurrentTeb()->Peb->BeingDebugged) return 0; /* no debugger present */ @@ -126,16 +127,18 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con req->len = i * sizeof(params[0]); wine_server_add_data( req, params, req->len ); wine_server_add_data( req, &server_context, sizeof(server_context) ); - if (!wine_server_call( req )) handle = wine_server_ptr_handle( reply->handle ); + if (!wine_server_call( req )) handle = reply->handle; } SERVER_END_REQ; if (!handle) return 0; - NTDLL_wait_for_multiple_objects( 1, &handle, SELECT_INTERRUPTIBLE, NULL, 0 ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = handle; + NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL, 0 ); SERVER_START_REQ( get_exception_status ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = handle; wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7a0d925..225121f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -63,7 +63,7 @@ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HIDDEN; extern NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; -extern NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, +extern NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) DECLSPEC_HIDDEN; /* init routines */ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 89f6ee6..aa01209 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1106,12 +1106,10 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re * * Implementation of NtWaitForMultipleObjects */ -NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, +NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) { - select_op_t select_op; NTSTATUS ret; - UINT i; int cookie; BOOL user_apc = FALSE; obj_handle_t apc_handle = 0; @@ -1120,8 +1118,6 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; memset( &result, 0, sizeof(result) ); - select_op.wait.op = SELECT_WAIT; - for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); for (;;) { @@ -1133,7 +1129,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN req->prev_apc = apc_handle; req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, &select_op, offsetof( select_op_t, wait.handles[count] )); + wine_server_add_data( req, select_op, size ); ret = wine_server_call( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; @@ -1172,13 +1168,16 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOLEAN wait_all, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { - UINT flags = SELECT_INTERRUPTIBLE; + select_op_t select_op; + UINT i, flags = SELECT_INTERRUPTIBLE; if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; if (wait_all) flags |= SELECT_ALL; if (alertable) flags |= SELECT_ALERTABLE; - return NTDLL_wait_for_multiple_objects( count, handles, flags, timeout, 0 ); + select_op.wait.op = SELECT_WAIT; + for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); + return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout, 0 ); } @@ -1197,11 +1196,14 @@ NTSTATUS WINAPI NtWaitForSingleObject(HANDLE handle, BOOLEAN alertable, const LA NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE hSignalObject, HANDLE hWaitObject, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { + select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; if (!hSignalObject) return STATUS_INVALID_HANDLE; if (alertable) flags |= SELECT_ALERTABLE; - return NTDLL_wait_for_multiple_objects( 1, &hWaitObject, flags, timeout, hSignalObject ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = wine_server_obj_handle( hWaitObject ); + return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), flags, timeout, hSignalObject ); } @@ -1226,7 +1228,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou { /* if alertable, we need to query the server */ if (alertable) - return NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, + return NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout, 0 ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */

1 0