wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Henri Verbeet : wined3d: Validate "data" in buffer_init().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 7f416ff339b0ba95dfbf64d151b7ef094134c62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f416ff339b0ba95dfbf64d15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:29 2015 +0200 wined3d: Validate "data" in buffer_init(). --- dlls/d3d10core/buffer.c | 7 +++---- dlls/d3d10core/tests/device.c | 4 ++++ dlls/wined3d/buffer.c | 13 ++++++++++--- include/wine/wined3d.h | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 84882a7..af0dd9c 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -239,10 +239,9 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags; - hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, - data ? data->pSysMem : NULL, buffer, &d3d10_buffer_wined3d_parent_ops, - &buffer->wined3d_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, + (const struct wined3d_sub_resource_data *)data, buffer, + &d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d buffer, hr %#x.\n", hr); wined3d_private_store_cleanup(&buffer->private_store); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index edfa33f..c75def4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -397,6 +397,7 @@ static void test_create_depthstencil_view(void) static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_SUBRESOURCE_DATA data = {0}; D3D10_TEXTURE2D_DESC texture_desc; ULONG refcount, expected_refcount; D3D10_BUFFER_DESC buffer_desc; @@ -418,6 +419,9 @@ static void test_create_rendertarget_view(void) buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &data, &buffer); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ea584df..40a137e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1132,7 +1132,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, GLenum bind_hint, - const char *data, void *parent, const struct wined3d_parent_ops *parent_ops) + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); @@ -1145,6 +1145,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return WINED3DERR_INVALIDCALL; } + if (data && !data->data) + { + WARN("Invalid sub-resource data specified.\n"); + return E_INVALIDARG; + } + hr = resource_init(&buffer->resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, 0, usage, pool, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops); if (FAILED(hr)) @@ -1205,7 +1211,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return hr; } - memcpy(ptr, data, size); + memcpy(ptr, data->data, size); wined3d_buffer_unmap(buffer); } @@ -1224,7 +1230,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, - const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_buffer **buffer) { struct wined3d_buffer *object; HRESULT hr; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6ff1a3e..9786c3c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2113,7 +2113,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, - const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Henri Verbeet : wined3d: Validate "data" in wined3d_texture_upload_data().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 62454ae71d81eea0bd61a19af9f7fe38ed739454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62454ae71d81eea0bd61a19af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:28 2015 +0200 wined3d: Validate "data" in wined3d_texture_upload_data(). --- dlls/d3d10core/tests/device.c | 8 ++++++++ dlls/wined3d/texture.c | 22 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0b03285..edfa33f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -164,6 +164,7 @@ static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, BOOL static void test_create_texture2d(void) { ULONG refcount, expected_refcount; + D3D10_SUBRESOURCE_DATA data = {0}; ID3D10Device *device, *tmp; D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; @@ -188,6 +189,9 @@ static void test_create_texture2d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); @@ -255,6 +259,7 @@ static void test_create_texture2d(void) static void test_create_texture3d(void) { ULONG refcount, expected_refcount; + D3D10_SUBRESOURCE_DATA data = {0}; ID3D10Device *device, *tmp; D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; @@ -277,6 +282,9 @@ static void test_create_texture3d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture3D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e039e4..82694bb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -727,12 +727,22 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static void wined3d_texture_upload_data(struct wined3d_texture *texture, const struct wined3d_sub_resource_data *data) +static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, + const struct wined3d_sub_resource_data *data) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_context *context; unsigned int i; + for (i = 0; i < sub_count; ++i) + { + if (!data[i].data) + { + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + return E_INVALIDARG; + } + } + context = context_acquire(texture->resource.device, NULL); wined3d_texture_prepare_texture(texture, context, FALSE); @@ -748,6 +758,8 @@ static void wined3d_texture_upload_data(struct wined3d_texture *texture, const s } context_release(context); + + return WINED3D_OK; } static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, @@ -1444,8 +1456,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ - if (data) - wined3d_texture_upload_data(object, data); + if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) + { + wined3d_texture_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created texture %p.\n", object); *texture = object;

1 0

Sebastian Lackner : wintrust: Create a dummy context to force creation of MachineGuid registry key.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: e5e05b971b64496d3967fc3f8b9cdf8d608d14a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e05b971b64496d3967fc3f8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 08:07:33 2015 +0200 wintrust: Create a dummy context to force creation of MachineGuid registry key. --- dlls/wintrust/register.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 9981fbc..303426c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -960,6 +960,8 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT CryptRegisterRes = S_OK; HRESULT TrustProviderRes = S_OK; HRESULT SIPAddProviderRes = S_OK; + HCRYPTPROV crypt_provider; + BOOL ret; TRACE("\n"); @@ -1077,6 +1079,11 @@ add_trust_providers: * a trust provider without a diagnostic policy). */ + /* Create a dummy context to force creation of the MachineGuid registry key. */ + ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (ret) CryptReleaseContext(crypt_provider, 0); + else ERR("Failed to acquire cryptographic context: %u\n", GetLastError()); + /* If CryptRegisterRes is not S_OK it will always overrule the return value. */ if (CryptRegisterRes != S_OK) return CryptRegisterRes;

1 0

Sebastian Lackner : opencl: Define CL_USE_DEPRECATED_OPENCL_2_0_APIS to avoid warnings.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: f652283368b856972b5b9794d3f4a1d1da221f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f652283368b856972b5b9794d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:56:31 2015 +0200 opencl: Define CL_USE_DEPRECATED_OPENCL_2_0_APIS to avoid warnings. --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index c3d25b5..f690733 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #if defined(HAVE_CL_CL_H) #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#define CL_USE_DEPRECATED_OPENCL_2_0_APIS #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Sebastian Lackner : kernel32/tests: Add tests for JobObjectLimitInformation info classes.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 1d2331344fbfce2bf9f66a08a609895f10fca094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2331344fbfce2bf9f66a08a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:49:04 2015 +0200 kernel32/tests: Add tests for JobObjectLimitInformation info classes. --- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f62e13..113ec35 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2304,6 +2304,8 @@ static void test_QueryInformationJobObject(void) { char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; DWORD dwret, ret_len; PROCESS_INFORMATION pi[2]; HANDLE job; @@ -2374,6 +2376,34 @@ static void test_QueryInformationJobObject(void) } } + /* test JobObjectBasicLimitInformation */ + ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info, + sizeof(*basic_limit_info) - 1, &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); + + ret_len = 0xdeadbeef; + memset(basic_limit_info, 0x11, sizeof(*basic_limit_info)); + ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info, + sizeof(*basic_limit_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(*basic_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(0, basic_limit_info->LimitFlags); + + /* test JobObjectExtendedLimitInformation */ + ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info, + sizeof(ext_limit_info) - 1, &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); + + ret_len = 0xdeadbeef; + memset(&ext_limit_info, 0x11, sizeof(ext_limit_info)); + ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info, + sizeof(ext_limit_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(0, basic_limit_info->LimitFlags); + TerminateProcess(pi[0].hProcess, 0); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread);

1 0

Sebastian Lackner : ntdll: Improve stub for NtQueryInformationJobObject.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 10509889973a5182e68c7f746b88ccc1efa2e956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10509889973a5182e68c7f746… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:48:47 2015 +0200 ntdll: Improve stub for NtQueryInformationJobObject. --- dlls/ntdll/sync.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 04c6de30..b0329ab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -636,7 +636,39 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c ULONG len, PULONG ret_len ) { FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); - return STATUS_NOT_IMPLEMENTED; + + if (class >= MaxJobObjectInfoClass) + return STATUS_INVALID_PARAMETER; + + switch (class) + { + case JobObjectExtendedLimitInformation: + { + JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit; + if (len < sizeof(*extended_limit)) + return STATUS_INFO_LENGTH_MISMATCH; + + extended_limit = (JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info; + memset(extended_limit, 0, sizeof(*extended_limit)); + if (ret_len) *ret_len = sizeof(*extended_limit); + return STATUS_SUCCESS; + } + + case JobObjectBasicLimitInformation: + { + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; + if (len < sizeof(*basic_limit)) + return STATUS_INFO_LENGTH_MISMATCH; + + basic_limit = (JOBOBJECT_BASIC_LIMIT_INFORMATION *)info; + memset(basic_limit, 0, sizeof(*basic_limit)); + if (ret_len) *ret_len = sizeof(*basic_limit); + return STATUS_SUCCESS; + } + + default: + return STATUS_NOT_IMPLEMENTED; + } } /******************************************************************************

1 0

Piotr Caban : ole32/tests: Fix new failures in CoWaitForMultipleHandles tests.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 9fd75e865073e304573877e6a312fdff6d6f7476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd75e865073e304573877e6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 31 00:39:00 2015 +0200 ole32/tests: Fix new failures in CoWaitForMultipleHandles tests. --- dlls/ole32/tests/compobj.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1dc3af0..ecd8fb0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2145,16 +2145,16 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); - ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); - ok(index == 0, "expected index 0, got %u\n", index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); index = 0xdeadbeef; PostMessageA(hWnd, WM_USER, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); - ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); - ok(index == 0, "expected index 0, got %u\n", index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n");

1 0

Nikolay Sivov : dwrite: Implement DrawGlyphRun().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 44c301c584935fbe4a1e95e65306f5ec13791552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c301c584935fbe4a1e95e65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:30:50 2015 +0300 dwrite: Implement DrawGlyphRun(). --- dlls/dwrite/gdiinterop.c | 171 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 154 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index aeb61eb..86778df 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -1,6 +1,7 @@ /* * GDI Interop * + * Copyright 2011 Huw Davies * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -36,17 +37,30 @@ struct gdiinterop { IDWriteFactory2 *factory; }; +struct dib_data { + DWORD *ptr; + int stride; + int width; +}; + struct rendertarget { IDWriteBitmapRenderTarget1 IDWriteBitmapRenderTarget1_iface; LONG ref; + IDWriteFactory *factory; DWRITE_TEXT_ANTIALIAS_MODE antialiasmode; - FLOAT pixels_per_dip; + FLOAT ppdip; DWRITE_MATRIX m; SIZE size; HDC hdc; + struct dib_data dib; }; +static inline int get_dib_stride(int width, int bpp) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + static HRESULT create_target_dibsection(struct rendertarget *target, UINT32 width, UINT32 height) { char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; @@ -64,9 +78,17 @@ static HRESULT create_target_dibsection(struct rendertarget *target, UINT32 widt bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(target->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); - if (!hbm) + hbm = CreateDIBSection(target->hdc, bmi, DIB_RGB_COLORS, (void**)&target->dib.ptr, NULL, 0); + if (!hbm) { hbm = CreateBitmap(1, 1, 1, 1, NULL); + target->dib.ptr = NULL; + target->dib.stride = 0; + target->dib.width = 0; + } + else { + target->dib.stride = get_dib_stride(width, 32); + target->dib.width = width; + } DeleteObject(SelectObject(target->hdc, hbm)); return S_OK; @@ -119,6 +141,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) if (!ref) { + IDWriteFactory_Release(This->factory); DeleteDC(This->hdc); heap_free(This); } @@ -126,15 +149,127 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) return ref; } +static inline DWORD *get_pixel_ptr_32(struct dib_data *dib, int x, int y) +{ + return (DWORD *)((BYTE*)dib->ptr + y * dib->stride + x * 4); +} + +static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWORD text_pixel) +{ + DWORD *dst_ptr = get_pixel_ptr_32(dib, rect->left, rect->top); + int x, y, src_width = rect->right - rect->left; + + for (y = rect->top; y < rect->bottom; y++) { + for (x = 0; x < src_width; x++) { + if (src[x] < DWRITE_ALPHA_MAX) continue; + dst_ptr[x] = text_pixel; + } + + src += src_width; + dst_ptr += dib->stride / 4; + } +} + +static inline BYTE blend_color(BYTE dst, BYTE src, BYTE alpha) +{ + return (src * alpha + dst * (255 - alpha) + 127) / 255; +} + +static inline DWORD blend_subpixel(BYTE r, BYTE g, BYTE b, DWORD text, const BYTE *alpha) +{ + return blend_color(r, text >> 16, alpha[0]) << 16 | + blend_color(g, text >> 8, alpha[1]) << 8 | + blend_color(b, text, alpha[2]); +} + +static void blit_subpixel_888(struct dib_data *dib, int dib_width, const BYTE *src, + const RECT *rect, DWORD text_pixel) +{ + DWORD *dst_ptr = get_pixel_ptr_32(dib, rect->left, rect->top); + int x, y, src_width = rect->right - rect->left; + + for (y = rect->top; y < rect->bottom; y++) { + for (x = 0; x < src_width; x++) { + if (src[3*x] == 0 && src[3*x+1] == 0 && src[3*x+2] == 0) continue; + dst_ptr[x] = blend_subpixel(dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, &src[3*x]); + } + dst_ptr += dib->stride / 4; + src += src_width * 3; + } +} + static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *iface, - FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode, - DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor, - RECT *blackbox_rect) + FLOAT originX, FLOAT originY, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GLYPH_RUN const *run, IDWriteRenderingParams *params, COLORREF color, + RECT *bbox_ret) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY, - measuring_mode, glyph_run, params, textColor, blackbox_rect); - return E_NOTIMPL; + IDWriteGlyphRunAnalysis *analysis; + DWRITE_RENDERING_MODE rendermode; + DWRITE_TEXTURE_TYPE texturetype; + RECT target, bounds; + HRESULT hr; + + TRACE("(%p)->(%.2f %.2f %d %p %p 0x%08x %p)\n", This, originX, originY, + measuring_mode, run, params, color, bbox_ret); + + if (!This->dib.ptr) + return S_OK; + + hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, + This->ppdip, measuring_mode, params, &rendermode); + if (FAILED(hr)) + return hr; + + /* FIXME: outline mode rendering is not supported for this target yet */ + if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) + rendermode = DWRITE_RENDERING_MODE_ALIASED; + + hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, + run, This->ppdip, &This->m, rendermode, measuring_mode, + originX, originY, &analysis); + if (FAILED(hr)) { + WARN("failed to create analysis instance, 0x%08x\n", hr); + return hr; + } + + SetRectEmpty(&bounds); + texturetype = DWRITE_TEXTURE_ALIASED_1x1; + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &bounds); + if (FAILED(hr) || IsRectEmpty(&bounds)) { + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); + texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1; + } + + target.left = target.top = 0; + target.right = This->size.cx; + target.bottom = This->size.cy; + + SetRectEmpty(bbox_ret); + if (IntersectRect(&target, &target, &bounds)) { + UINT32 size = (target.right - target.left) * (target.bottom - target.top); + BYTE *bitmap; + + if (texturetype == DWRITE_TEXTURE_CLEARTYPE_3x1) + size *= 3; + bitmap = heap_alloc_zero(size); + hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texturetype, &target, bitmap, size); + if (hr == S_OK) { + /* blit to target dib */ + if (texturetype == DWRITE_TEXTURE_ALIASED_1x1) + blit_8(&This->dib, bitmap, &target, color); + else + blit_subpixel_888(&This->dib, This->size.cx, bitmap, &target, color); + + *bbox_ret = target; + } + + heap_free(bitmap); + } + + IDWriteGlyphRunAnalysis_Release(analysis); + + return S_OK; } static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget1 *iface) @@ -148,19 +283,19 @@ static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget1 *ifa { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); TRACE("(%p)\n", This); - return This->pixels_per_dip; + return This->ppdip; } -static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, FLOAT pixels_per_dip) +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, FLOAT ppdip) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%.2f)\n", This, pixels_per_dip); + TRACE("(%p)->(%.2f)\n", This, ppdip); - if (pixels_per_dip <= 0.0) + if (ppdip <= 0.0) return E_INVALIDARG; - This->pixels_per_dip = pixels_per_dip; + This->ppdip = ppdip; return S_OK; } @@ -241,7 +376,7 @@ static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { rendertarget_SetTextAntialiasMode }; -static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) +static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) { struct rendertarget *target; HRESULT hr; @@ -262,8 +397,10 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite } target->m = identity; - target->pixels_per_dip = 1.0; + target->ppdip = 1.0; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + target->factory = factory; + IDWriteFactory_AddRef(factory); *ret = (IDWriteBitmapRenderTarget*)&target->IDWriteBitmapRenderTarget1_iface; @@ -501,7 +638,7 @@ static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *ifa { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget(hdc, width, height, target); + return create_rendertarget((IDWriteFactory*)This->factory, hdc, width, height, target); } static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = {

1 0

Nikolay Sivov : dwrite: Implement CreateAlphaTexture().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: e08b77b0a92aa1f0d28e9a27ade000e4904d189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08b77b0a92aa1f0d28e9a27a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:30:08 2015 +0300 dwrite: Implement CreateAlphaTexture(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 130 ++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 65 +++++++++++++++++++++- include/dwrite.idl | 2 + 4 files changed, 189 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e08b77b0a92aa1f0d28e9…

1 0

Nikolay Sivov : dwrite: Translate rendered bitmap bounds to given origin.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 6d1f47902b9c5cfd3398375de5322320c895a78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1f47902b9c5cfd3398375de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:29:39 2015 +0300 dwrite: Translate rendered bitmap bounds to given origin. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 10 +++++++++- dlls/dwrite/main.c | 8 ++++---- dlls/dwrite/tests/font.c | 23 ++++++++++++++++++++++- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0c25483..59bef03 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -124,7 +124,7 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a3f58b9..5f32c31 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -117,6 +117,8 @@ struct dwrite_glyphrunanalysis { DWRITE_RENDERING_MODE rendering_mode; DWRITE_GLYPH_RUN run; FLOAT ppdip; + FLOAT originX; + FLOAT originY; UINT16 *glyphs; FLOAT *advances; DWRITE_GLYPH_OFFSET *offsets; @@ -2956,6 +2958,9 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a IDWriteFontFace2_Release(fontface2); + /* translate to given run origin */ + OffsetRect(&analysis->bounds, analysis->originX, analysis->originY); + analysis->ready |= RUNANALYSIS_BOUNDS; *bounds = analysis->bounds; } @@ -3075,7 +3080,8 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_GetAlphaBlendParams }; -HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, IDWriteGlyphRunAnalysis **ret) +HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, + FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; @@ -3094,6 +3100,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLY analysis->rendering_mode = rendering_mode; analysis->ready = 0; analysis->ppdip = ppdip; + analysis->originX = originX; + analysis->originY = originY; SetRectEmpty(&analysis->bounds); analysis->run = *run; IDWriteFontFace_AddRef(analysis->run.fontFace); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9f8454f..5a8c026 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1072,14 +1072,14 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory2 *if static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, - DWRITE_MEASURING_MODE measuring_mode, FLOAT baseline_x, FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis) + DWRITE_MEASURING_MODE measuring_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%p %.2f %p %d %d %f %f %p)\n", This, run, ppdip, transform, rendering_mode, - measuring_mode, baseline_x, baseline_y, analysis); + TRACE("(%p)->(%p %.2f %p %d %d %.2f %.2f %p)\n", This, run, ppdip, transform, rendering_mode, + measuring_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, run, ppdip, analysis); + return create_glyphrunanalysis(rendering_mode, run, ppdip, originX, originY, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index aeb84bb..c132159 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3435,7 +3435,7 @@ static void test_CreateGlyphRunAnalysis(void) FLOAT advance; HRESULT hr; UINT32 ch; - RECT rect; + RECT rect, rect2; DWRITE_GLYPH_OFFSET offset; DWRITE_GLYPH_METRICS metrics; DWRITE_FONT_METRICS fm; @@ -3489,8 +3489,29 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(rect.left == 0 && rect.right == 0 && rect.top == 0 && rect.bottom == 0, "unexpected rect\n"); + + /* check how origin affects bounds */ + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect), "got empty rect\n"); + IDWriteGlyphRunAnalysis_Release(analysis); + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 10.0, -5.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&rect2, 0, sizeof(rect2)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect2), "got empty rect\n"); IDWriteGlyphRunAnalysis_Release(analysis); + ok(!EqualRect(&rect, &rect2), "got equal bounds\n"); + OffsetRect(&rect, 10, -5); + ok(EqualRect(&rect, &rect2), "got different bounds\n"); + for (i = 0; i < sizeof(rendermodes)/sizeof(rendermodes[0]); i++) { hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, rendermodes[i], DWRITE_MEASURING_MODE_NATURAL,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015