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

Nikolay Sivov : server: Fix string length used with strncmpW().
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 2ef7e5fdaeae5a14ea87bf12a7e055727ed750bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef7e5fdaeae5a14ea87bf12a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 27 14:15:36 2013 +0400 server: Fix string length used with strncmpW(). --- server/console.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/console.c b/server/console.c index 3f90937..538ad3f 100644 --- a/server/console.c +++ b/server/console.c @@ -1034,7 +1034,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA ptr[len] = 0; if (console->history_mode && console->history_index && - strncmpW( console->history[console->history_index - 1], ptr, len * sizeof(WCHAR) ) == 0) + strncmpW( console->history[console->history_index - 1], ptr, len ) == 0) { /* ok, mode ask us to not use twice the same string... * so just free mem and returns

1 0

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

Aug. 27, 2013

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

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

Aug. 27, 2013

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

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

Aug. 27, 2013

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 UpdateTexture tests with volumes.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

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 a volume texture locking test.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

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 a volume texture locking test.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 82b6c46006043f110daf5d1b1f3ae93942c9a3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b6c46006043f110daf5d1b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 27 12:36:20 2013 +0200 d3d9/tests: Add a volume texture locking test. --- dlls/d3d9/tests/device.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2355ab4..584f827 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6454,6 +6454,90 @@ static void test_vidmem_accounting(void) DestroyWindow(window); } +static void test_volume_locking(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + HWND window; + HRESULT hr; + IDirect3DVolumeTexture9 *texture; + unsigned int i; + D3DLOCKED_BOX locked_box; + ULONG refcount; + D3DCAPS9 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 (!(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++) + { + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 1, tests[i].usage, + D3DFMT_A8R8G8B8, tests[i].pool, &texture, NULL); + 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 = IDirect3DVolumeTexture9_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 = IDirect3DVolumeTexture9_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); + } + IDirect3DVolumeTexture9_Release(texture); + } + +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" ); @@ -6544,6 +6628,7 @@ START_TEST(device) test_rtpatch(); test_npot_textures(); test_vidmem_accounting(); + test_volume_locking(); } out:

1 0

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

Aug. 27, 2013

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

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 810ec233c0bffe4a4bd0cac4e36c1f72b9079190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ec233c0bffe4a4bd0cac4e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:40:08 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias. --- dlls/oleaut32/tests/typelib.c | 341 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 82 +++++++---- 2 files changed, 393 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=810ec233c0bffe4a4bd0c…

1 0

Andrew Eikum : oleaut32: Resize 32-bit typeinfos when loaded in 64-bit.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 56aa7d015d559dc8dafed52c4456673a3974dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aa7d015d559dc8dafed52c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:39:48 2013 -0500 oleaut32: Resize 32-bit typeinfos when loaded in 64-bit. --- dlls/oleaut32/typelib.c | 172 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 163 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 118e1f0..8985a02 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1909,6 +1909,120 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) return str; } +static HRESULT TLB_get_size_from_hreftype(ITypeInfoImpl *info, HREFTYPE href, + ULONG *size, WORD *align) +{ + ITypeInfo *other; + TYPEATTR *attr; + HRESULT hr; + + hr = ITypeInfo2_GetRefTypeInfo(&info->ITypeInfo2_iface, href, &other); + if(FAILED(hr)) + return hr; + + hr = ITypeInfo_GetTypeAttr(other, &attr); + if(FAILED(hr)){ + ITypeInfo_Release(other); + return hr; + } + + if(size) + *size = attr->cbSizeInstance; + if(align) + *align = attr->cbAlignment; + + ITypeInfo_ReleaseTypeAttr(other, attr); + ITypeInfo_Release(other); + + return S_OK; +} + +static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, + TYPEDESC *tdesc, ULONG *size, WORD *align) +{ + ULONG i, sub, ptr_size; + HRESULT hr; + + ptr_size = get_ptr_size(sys); + + switch(tdesc->vt){ + case VT_VOID: + *size = 0; + break; + case VT_I1: + case VT_UI1: + *size = 1; + break; + case VT_I2: + case VT_BOOL: + case VT_UI2: + *size = 2; + break; + case VT_I4: + case VT_R4: + case VT_ERROR: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + *size = 4; + break; + case VT_R8: + case VT_I8: + case VT_UI8: + *size = 8; + break; + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + *size = ptr_size; + break; + case VT_DATE: + *size = sizeof(DATE); + break; + case VT_VARIANT: + *size = sizeof(VARIANT); +#ifdef _WIN64 + if(sys == SYS_WIN32) + *size -= 8; /* 32-bit VARIANT is 8 bytes smaller than 64-bit VARIANT */ +#endif + break; + case VT_DECIMAL: + *size = sizeof(DECIMAL); + break; + case VT_CY: + *size = sizeof(CY); + break; + case VT_CARRAY: + *size = 0; + for(i = 0; i < tdesc->u.lpadesc->cDims; ++i) + *size += tdesc->u.lpadesc->rgbounds[i].cElements; + hr = TLB_size_instance(info, sys, &tdesc->u.lpadesc->tdescElem, &sub, align); + if(FAILED(hr)) + return hr; + *size *= sub; + return S_OK; + case VT_USERDEFINED: + return TLB_get_size_from_hreftype(info, tdesc->u.hreftype, size, align); + default: + FIXME("Unsized VT: 0x%x\n", tdesc->vt); + return E_FAIL; + } + + if(align){ + if(*size < 4) + *align = *size; + else + *align = 4; + } + + return S_OK; +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -2512,6 +2626,47 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, ++pImpl; } } + +#ifdef _WIN64 +/* when a 32-bit typelib is loaded in 64-bit mode, we need to resize pointers + * and some structures, and fix the alignment */ +static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) +{ + if(info->typekind == TKIND_ALIAS){ + switch(info->tdescAlias.vt){ + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + break; + case VT_CARRAY: + case VT_USERDEFINED: + TLB_size_instance(info, SYS_WIN64, &info->tdescAlias, &info->cbSizeInstance, &info->cbAlignment); + break; + case VT_VARIANT: + info->cbSizeInstance = sizeof(VARIANT); + info->cbAlignment = 8; + default: + if(info->cbSizeInstance < sizeof(void*)) + info->cbAlignment = info->cbSizeInstance; + else + info->cbAlignment = sizeof(void*); + break; + } + }else if(info->typekind == TKIND_INTERFACE || + info->typekind == TKIND_DISPATCH || + info->typekind == TKIND_COCLASS){ + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + } +} +#endif + /* * process a typeinfo record */ @@ -2537,18 +2692,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbSizeInstance=sizeof(void*); -#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbAlignment = 8; -#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -3318,6 +3465,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; + int i; TRACE("%p, TLB length = %d\n", pLib, dwTLBLength); @@ -3503,7 +3651,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(tlbHeader.nrtypeinfos >= 0 ) { ITypeInfoImpl **ppTI; - int i; ppTI = pTypeLibImpl->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*) * tlbHeader.nrtypeinfos); @@ -3516,6 +3663,13 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } +#ifdef _WIN64 + if(pTypeLibImpl->syskind == SYS_WIN32){ + for(i = 0; i < pTypeLibImpl->TypeInfoCount; ++i) + TLB_fix_32on64_typeinfo(pTypeLibImpl->typeinfos[i]); + } +#endif + TRACE("(%p)\n", pTypeLibImpl); return &pTypeLibImpl->ITypeLib2_iface; }

1 0