December 2013 - Wine-commits

Stefan Dösinger : d3d9/tests: Test user memory with D3DPOOL_SCRATCH.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: b7b0b7d2e1f8a2fa73ce5e801a0e4f00cc9abc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b0b7d2e1f8a2fa73ce5e801… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:55 2013 +0100 d3d9/tests: Test user memory with D3DPOOL_SCRATCH. --- dlls/d3d9/device.c | 7 +++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5dc207a..6721101 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -747,7 +747,14 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, set_mem = TRUE; } else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5825c35..810d2a0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -535,7 +535,7 @@ out: IDirect3D9Ex_Release(d3d9ex); } -static void test_texture_sysmem_create(void) +static void test_user_memory(void) { IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; @@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void) hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); @@ -1114,7 +1117,7 @@ START_TEST(d3d9ex) test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); - test_texture_sysmem_create(); + test_user_memory(); test_reset(); test_reset_resources(); test_vidmem_accounting();

1 0

Stefan Dösinger : d3d9: Volume and cube textures do not support user memory.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: d9bd9a9a877f61d8082df4c0939a3c437b069fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bd9a9a877f61d8082df4c09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:56 2013 +0100 d3d9: Volume and cube textures do not support user memory. --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/d3d9ex.c | 21 ++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6721101..65fd377 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -800,7 +800,14 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared volume texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -833,7 +840,14 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared cube texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 810d2a0..1df6eb8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -539,11 +539,14 @@ static void test_user_memory(void) { IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; + IDirect3DCubeTexture9 *cube_texture; + IDirect3DVolumeTexture9 *volume_texture; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; HRESULT hr; void *mem; + D3DCAPS9 caps; window = create_window(); if (!(device = create_device(window, window, TRUE))) @@ -552,6 +555,9 @@ static void test_user_memory(void) goto done; } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * 128 * 4); hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); @@ -576,8 +582,21 @@ static void test_user_memory(void) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - HeapFree(GetProcessHeap(), 0, mem); + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 2, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 2, 2, 2, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9: Buffers do not support user memory.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 96c7a4d6ca2a6343fada379dc4229ebee0d940bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c7a4d6ca2a6343fada379dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:57 2013 +0100 d3d9: Buffers do not support user memory. --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/d3d9ex.c | 9 +++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 65fd377..598fff0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -879,7 +879,14 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, iface, size, usage, fvf, pool, buffer, shared_handle); if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared vertex buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -911,7 +918,14 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U iface, size, usage, format, pool, buffer, shared_handle); if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared index buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1df6eb8..22134c3 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -541,6 +541,8 @@ static void test_user_memory(void) IDirect3DTexture9 *texture; IDirect3DCubeTexture9 *cube_texture; IDirect3DVolumeTexture9 *volume_texture; + IDirect3DVertexBuffer9 *vertex_buffer; + IDirect3DIndexBuffer9 *index_buffer; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; @@ -596,6 +598,13 @@ static void test_user_memory(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, 0, D3DFMT_INDEX32, D3DPOOL_SYSTEMMEM, + &index_buffer, &mem); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &vertex_buffer, &mem); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9: Implement user memory for offscreen plain surfaces.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 62df35c312d9f65bb775e07d47ebab3ab8495110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62df35c312d9f65bb775e07d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:58 2013 +0100 d3d9: Implement user memory for offscreen plain surfaces. --- dlls/d3d9/device.c | 31 ++++++++++++++++++++++++------- dlls/d3d9/tests/d3d9ex.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 598fff0..57252e7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -947,7 +947,7 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width, UINT height, D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, - D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) + D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem) { struct wined3d_resource *sub_resource; struct wined3d_resource_desc desc; @@ -989,6 +989,9 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width IDirect3DSurface9_AddRef(*surface); wined3d_texture_decref(texture); + if (user_mem) + wined3d_surface_set_mem(surface_impl->wined3d_surface, user_mem, 0); + wined3d_mutex_unlock(); return D3D_OK; @@ -1014,7 +1017,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, flags |= WINED3D_SURFACE_MAPPABLE; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, UINT width, UINT height, @@ -1037,7 +1040,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * flags |= WINED3D_SURFACE_DISCARD; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } @@ -1222,24 +1225,38 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + void *user_mem = NULL; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", iface, width, height, format, pool, surface, shared_handle); *surface = NULL; - if (shared_handle) - FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - if (pool == D3DPOOL_MANAGED) { WARN("Attempting to create a managed offscreen plain surface.\n"); return D3DERR_INVALIDCALL; } + + if (shared_handle) + { + if (pool == D3DPOOL_SYSTEMMEM) + user_mem = *shared_handle; + else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared surface in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } + } + /* FIXME: Offscreen surfaces are supposed to be always lockable, * regardless of the pool they're created in. Should we set dynamic usage * here? */ return d3d9_device_create_surface(device, width, height, format, - WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0); + WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); } static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 *surface) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 22134c3..7f39d70 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -543,6 +543,7 @@ static void test_user_memory(void) IDirect3DVolumeTexture9 *volume_texture; IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; + IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; @@ -605,6 +606,36 @@ static void test_user_memory(void) &vertex_buffer, &mem); ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, &mem); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, &mem, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + } + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &surface, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &surface, &mem, 0); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9: shared_handle must be NULL in non-ex d3d9.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 58f16ddd4ef538d3dd66ca14ef6253092441c213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f16ddd4ef538d3dd66ca14e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:59 2013 +0100 d3d9: shared_handle must be NULL in non-ex d3d9. --- dlls/d3d9/device.c | 52 +++++++++++++++++++++++ dlls/d3d9/tests/device.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57252e7..ea49b0a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -740,6 +740,12 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool == D3DPOOL_SYSTEMMEM) { if (levels != 1) @@ -801,6 +807,12 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared volume texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared volume texture in pool %#x.\n", pool); @@ -841,6 +853,12 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared cube texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared cube texture in pool %#x.\n", pool); @@ -880,6 +898,12 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared vertex buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared vertex buffer in pool %#x.\n", pool); @@ -919,6 +943,12 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared index buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared index buffer in pool %#x.\n", pool); @@ -1011,7 +1041,15 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared render target on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (lockable) flags |= WINED3D_SURFACE_MAPPABLE; @@ -1034,7 +1072,15 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared depth stencil on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (discard) flags |= WINED3D_SURFACE_DISCARD; @@ -1239,6 +1285,12 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory surface on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool == D3DPOOL_SYSTEMMEM) user_mem = *shared_handle; else diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4040254..799f1c3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7329,6 +7329,110 @@ static void test_lockbox_invalid(void) DestroyWindow(window); } +static void test_shared_handle(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + /* Native d3d9ex refuses to create a shared texture if the texture pointer + * is not initialized to NULL. Make sure this doesn't cause issues here. */ + IDirect3DTexture9 *texture = NULL; + IDirect3DSurface9 *surface = NULL; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + IDirect3DIndexBuffer9 *index_buffer = NULL; + HANDLE handle = NULL; + void *mem; + D3DCAPS9 caps; + + if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create D3D object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + mem = HeapAlloc(GetProcessHeap(), 0, 128 * 128 * 4); + + /* Windows XP returns E_NOTIMPL, Windows 7 returns INVALIDCALL, except for + * CreateVertexBuffer, where it returns NOTAVAILABLE. */ + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_DEFAULT, + &vertex_buffer, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &vertex_buffer, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_NOTAVAILABLE), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, 0, 0, D3DPOOL_DEFAULT, + &index_buffer, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &index_buffer, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + IDirect3DCubeTexture9 *cube_texture = NULL; + hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &cube_texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + } + + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + IDirect3DVolumeTexture9 *volume_texture = NULL; + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &volume_texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + HeapFree(GetProcessHeap(), 0, mem); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -7423,6 +7527,7 @@ START_TEST(device) test_create_rt_ds_fail(); test_volume_blocks(); test_lockbox_invalid(); + test_shared_handle(); } out:

1 0

André Hentschel : winedbg: Improve formatting of context printing.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 5ac1ecfbe5b30b87d0a179b15fd03b9554b0e193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac1ecfbe5b30b87d0a179b15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 9 21:06:26 2013 +0100 winedbg: Improve formatting of context printing. --- programs/winedbg/be_arm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 1bbefd4..bf28a04 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1717,14 +1717,14 @@ static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_reg if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x(%s)\n", + dbg_printf(" Pc:%08x Sp:%08x Lr:%08x Cpsr:%08x(%s)\n", ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); - dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", + dbg_printf(" r0:%08x r1:%08x r2:%08x r3:%08x\n", ctx->R0, ctx->R1, ctx->R2, ctx->R3); - dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n", - ctx->R4, ctx->R5, ctx->R6, ctx->R7, ctx->R8 ); - dbg_printf(" r9:%04x r10:%04x Fp:%04x Ip:%04x\n", - ctx->R9, ctx->R10, ctx->Fp, ctx->Ip ); + dbg_printf(" r4:%08x r5:%08x r6:%08x r7:%08x\n", + ctx->R4, ctx->R5, ctx->R6, ctx->R7); + dbg_printf(" r8:%08x r9:%08x r10:%08x Fp:%08x Ip:%08x\n", + ctx->R8, ctx->R9, ctx->R10, ctx->Fp, ctx->Ip); if (all_regs) dbg_printf( "Floating point ARM dump not implemented\n" ); }

1 0

刘涛 : website: Add Simplified Chinese translation for wine 1.7.8 released
by Jeremy Newman 10 Dec '13

10 Dec '13

Module: website Branch: master Commit: 15e1cb8b168e44b8261f5e94ca0ff57f4c52e560 URL: http://source.winehq.org/git/website.git/?a=commit;h=15e1cb8b168e44b8261f5e… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Dec 9 14:28:31 2013 +0800 website: Add Simplified Chinese translation for wine 1.7.8 released --- news/zh-cn/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013120601.xml b/news/zh-cn/2013120601.xml new file mode 100644 index 0000000..b1b35af --- /dev/null +++ b/news/zh-cn/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>十二月 6, 2013</date> +<title>Wine 1.7.8 发布</title> +<body> + Wine 开发版 1.7.8 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.8">更新</a> : +<ul> + <li>升级了 Mono 包的版本。</li> + <li>改进了 BITS 服务的实现。</li> + <li>更好的数据表来支持日文垂直字体。</li> + <li>改进了最近 Mac OS X 版本中的回溯。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 10 Dec '13

10 Dec '13

Module: website Branch: master Commit: 361763985623e99cf23e363fb65d3b3555a7ffcb URL: http://source.winehq.org/git/website.git/?a=commit;h=361763985623e99cf23e36… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 10 09:15:44 2013 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Nikolay Sivov : atl: Implement AtlComModuleRevokeClassObjects().
by Alexandre Julliard 09 Dec '13

09 Dec '13

Module: wine Branch: master Commit: 288f3aca62d68e3b1760d43e5f14ed0df56ca94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f3aca62d68e3b1760d43e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 15:33:39 2013 +0400 atl: Implement AtlComModuleRevokeClassObjects(). --- dlls/atl100/atl.c | 21 +++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl110/atl110.spec | 2 +- dlls/atl80/atl80.spec | 2 +- dlls/atl90/atl90.spec | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 726a855..9156afb 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -502,7 +502,28 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c } return S_OK; +} +/*********************************************************************** + * AtlComModuleRevokeClassObjects [atl100.20] + */ +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) +{ + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p)\n", module); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + hres = CoRevokeClassObject((*iter)->dwRegister); + if(FAILED(hres)) + return hres; + } + + return S_OK; } /*********************************************************************** diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1295f8c..0d41c1e 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index aed22bd..045969e 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 5a77629..3d53d06 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -7,7 +7,7 @@ 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index aed22bd..045969e 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop

1 0

Nikolay Sivov : ole32: Fix a memory leak caused by copy/pasted fragment ( Coverity).
by Alexandre Julliard 09 Dec '13

09 Dec '13

Module: wine Branch: master Commit: 5f66fb4febe0b82c9fd8333b3c9cf4123b631a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f66fb4febe0b82c9fd8333b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 7 10:09:28 2013 +0400 ole32: Fix a memory leak caused by copy/pasted fragment (Coverity). --- dlls/ole32/comcat.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index b8dcc53..46a722e 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -1346,9 +1346,6 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGU WCHAR keyname[100], clsidW[CHARS_IN_GUID]; CATID_IEnumGUIDImpl *This; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); - if (!This) return E_OUTOFMEMORY; - *ret = NULL; This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl));

1 0