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

Vincent Povirk : comdlg32: Partially implement IFileDialogCustomize:: EnableOpenDropDown.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: d3163241afcbe6fd7b10a7de44388a80cc15119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3163241afcbe6fd7b10a7de4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 15:40:42 2015 -0500 comdlg32: Partially implement IFileDialogCustomize::EnableOpenDropDown. This builds a menu but cannot display it yet. --- dlls/comdlg32/itemdlg.c | 84 ++++++++++++++++++++++++++++++++++--------- dlls/comdlg32/tests/itemdlg.c | 41 +++++++++++---------- 2 files changed, 91 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3163241afcbe6fd7b10a…

1 0

Dmitry Timoshkov : advapi32/tests: Fix compilation with PSDK.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 8a088d7c2f755345728ea9067d0bf43b4f9bc2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a088d7c2f755345728ea9067… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 19 12:23:22 2015 +0800 advapi32/tests: Fix compilation with PSDK. --- dlls/advapi32/tests/security.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 098fa8f..af61acb 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -130,6 +130,8 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,P static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); +static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); +static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static HMODULE hmod; static int myARGC; @@ -160,6 +162,8 @@ static void init(void) pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pRtlInitAnsiString = (void *)GetProcAddress(hntdll, "RtlInitAnsiString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); hmod = GetModuleHandleA("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -3101,7 +3105,8 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) ANSI_STRING str; NTSTATUS status; BOOLEAN ret; - RtlInitAnsiString(&str, name); + + pRtlInitAnsiString(&str, name); status = pRtlAnsiStringToUnicodeString(&strW, &str, TRUE); ok(!status, "RtlAnsiStringToUnicodeString failed with %08x\n", status); @@ -3109,7 +3114,7 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) ret = pRtlDosPathNameToNtPathName_U(strW.Buffer, nameW, NULL, NULL); ok(ret, "RtlDosPathNameToNtPathName_U failed\n"); - RtlFreeUnicodeString(&strW); + pRtlFreeUnicodeString(&strW); } static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD flags, DWORD mask, @@ -3349,7 +3354,7 @@ static void test_CreateDirectoryA(void) status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); ok(!status, "NtCreateFile failed with %08x\n", status); - RtlFreeUnicodeString(&tmpfileW); + pRtlFreeUnicodeString(&tmpfileW); error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, @@ -3384,7 +3389,7 @@ static void test_CreateDirectoryA(void) status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); ok(!status, "NtCreateFile failed with %08x\n", status); - RtlFreeUnicodeString(&tmpfileW); + pRtlFreeUnicodeString(&tmpfileW); HeapFree(GetProcessHeap(), 0, pDacl); error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT,

1 0

Dmitry Timoshkov : advapi32/tests: Add a test to show that PROCESS_QUERY_INFORMATION should implicitly grant PROCESS_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 9e22949cec82f05938fcca9c41948fdbeb0d14aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e22949cec82f05938fcca9c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 19 12:23:33 2015 +0800 advapi32/tests: Add a test to show that PROCESS_QUERY_INFORMATION should implicitly grant PROCESS_QUERY_LIMITED_INFORMATION access. --- dlls/advapi32/tests/security.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index af61acb..70aa949 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5567,6 +5567,16 @@ static void test_process_access(void) CloseHandle(dup); } + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), process, GetCurrentProcess(), &dup, + PROCESS_QUERY_INFORMATION, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + access = get_obj_access(dup); + ok(access == (PROCESS_QUERY_INFORMATION | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == PROCESS_QUERY_INFORMATION /* before Vista */, + "expected PROCESS_QUERY_INFORMATION|PROCESS_QUERY_LIMITED_INFORMATION, got %#x\n", access); + CloseHandle(dup); + TerminateProcess(process, 0); CloseHandle(process); }

1 0

Michael Müller : winecfg: Do not overwrite theme each time an item is drawn.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 130c655e2fa0fd7d1bf0dc385ea1511a2572834b URL: http://source.winehq.org/git/wine.git/?a=commit;h=130c655e2fa0fd7d1bf0dc385… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Aug 19 06:24:19 2015 +0200 winecfg: Do not overwrite theme each time an item is drawn. --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8bc3c88..1f4818b 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1094,7 +1094,7 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) HTHEME theme; RECT buttonrect; - theme = OpenThemeData(draw_info->hwndItem, WC_BUTTONW); + theme = OpenThemeData(NULL, WC_BUTTONW); if (theme) { MARGINS margins;

1 0

Michael Müller : krnl386.exe16: Increase buffer size in GetTempDrive.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 33aa59abea2ec4dc0d2354a44ec9d0a5af43e48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33aa59abea2ec4dc0d2354a44… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Aug 19 06:35:21 2015 +0200 krnl386.exe16: Increase buffer size in GetTempDrive. --- dlls/krnl386.exe16/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 6c3cef3..77908c2 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -461,10 +461,10 @@ LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) */ UINT WINAPI GetTempDrive( BYTE ignored ) { - WCHAR buffer[8]; + WCHAR buffer[MAX_PATH]; BYTE ret; - if (GetTempPathW( 8, buffer )) ret = (BYTE)toupperW(buffer[0]); + if (GetTempPathW( MAX_PATH, buffer )) ret = (BYTE)toupperW(buffer[0]); else ret = 'C'; return MAKELONG( ret | (':' << 8), 1 ); }

1 0

Henri Verbeet : wined3d: Also invalidate STATE_SHADER_RESOURCE_BINDING in wined3d_texture_bind_and_dirtify ().
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 8f6f9096d71c09d6eaae422b333756997f6ef15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6f9096d71c09d6eaae422b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:09 2015 +0200 wined3d: Also invalidate STATE_SHADER_RESOURCE_BINDING in wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 82694bb..27e0ecd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -273,6 +273,9 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, active_sampler = context->rev_tex_unit_map[context->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + /* FIXME: Ideally we'd only do this when touching a binding that's used by + * a shader. */ + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); wined3d_texture_bind(texture, context, srgb); }

1 0

Henri Verbeet : wined3d: Separate loading shader resources and updating their binding points.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: ee9b1311cd84f08a545fa0a9326bd4005e884611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9b1311cd84f08a545fa0a93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:10 2015 +0200 wined3d: Separate loading shader resources and updating their binding points. --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32813e9..79125d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3044,6 +3044,42 @@ static void context_preload_textures(struct wined3d_context *context, const stru } } +static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + buffer_internal_preload(state->cb[i][j], context, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + { + WARN("No resource view bound at index %u, %u.\n", i, entry->resource_idx); + continue; + } + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + buffer_internal_preload(buffer_from_resource(view->resource), context, state); + else + wined3d_texture_load(wined3d_texture_from_resource(view->resource), context, FALSE); + } + } +} + static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3102,7 +3138,6 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } texture = wined3d_texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); context_active_texture(context, gl_info, shader_types[i].base_idx + entry->bind_idx); wined3d_texture_bind(texture, context, FALSE); @@ -3118,7 +3153,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de const struct wined3d_state *state = &device->state; const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; - unsigned int i, j; + unsigned int i; WORD map; if (!context_validate_rt_config(context->gl_info->limits.buffers, @@ -3135,6 +3170,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); + context_load_shader_resources(context, state); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3160,15 +3196,6 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de buffer_get_sysmem(state->index_buffer, context); } - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - buffer_internal_preload(state->cb[i][j], context, state); - } - } - for (i = 0; i < context->numDirtyEntries; ++i) { DWORD rep = context->dirtyArray[i];

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_UpdateSubresource().
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 62a02a047faad817443a4498a11aa07423e2d608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a02a047faad817443a4498a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:11 2015 +0200 d3d10core: Implement d3d10_device_UpdateSubresource(). --- dlls/d3d10core/device.c | 22 +++- dlls/d3d10core/tests/device.c | 269 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 80 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 + 5 files changed, 374 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62a02a047faad817443a4…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_CopyFromMemory().
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 2474f5e33a4cdd6c38c6fe35fc19ba1f18f9d6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2474f5e33a4cdd6c38c6fe35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:12 2015 +0200 d2d1: Implement d2d_bitmap_CopyFromMemory(). --- dlls/d2d1/bitmap.c | 25 ++++++++++- dlls/d2d1/tests/d2d1.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b3348c6..8d22eac 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -143,9 +143,30 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *if static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface, const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch) { - FIXME("iface %p, dst_rect %p, src_data %p, pitch %u stub!\n", iface, dst_rect, src_data, pitch); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ID3D10Device *device; + ID3D10Resource *dst; + D3D10_BOX box; - return E_NOTIMPL; + TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); + + if (dst_rect) + { + box.left = dst_rect->left; + box.top = dst_rect->top; + box.front = 0; + box.right = dst_rect->right; + box.bottom = dst_rect->bottom; + box.back = 1; + } + + ID3D10ShaderResourceView_GetResource(bitmap->view, &dst); + ID3D10ShaderResourceView_GetDevice(bitmap->view, &device); + ID3D10Device_UpdateSubresource(device, dst, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D10Device_Release(device); + ID3D10Resource_Release(dst); + + return S_OK; } static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 739e2fb..dc7b38f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,6 +54,14 @@ static void set_rect(D2D1_RECT_F *rect, float left, float top, float right, floa rect->bottom = bottom; } +static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) { color->r = r; @@ -1998,6 +2006,110 @@ static void test_shared_bitmap(void) CoUninitialize(); } +static void test_bitmap_updates(void) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_RECT_U dst_rect; + ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; + D2D1_RECT_F rect; + D2D1_SIZE_U size; + HWND window; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 320.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + ID2D1Bitmap_Release(bitmap); + + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 240.0f, 320.0f, 480.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + set_rect_u(&dst_rect, 1, 1, 3, 3); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 3, 3, 4); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[6], 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 0, 4, 1); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[10], 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 1, 1, 3); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[2], sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 4, 4, 3, 1); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect(&rect, 320.0f, 240.0f, 640.0f, 480.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1Bitmap_CopyFromMemory(bitmap, NULL, bitmap_data, 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + + match = compare_surface(surface, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6"); + ok(match, "Surface does not match.\n"); + + ID2D1Bitmap_Release(bitmap); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -2008,4 +2120,5 @@ START_TEST(d2d1) test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap(); + test_bitmap_updates(); }

1 0

Henri Verbeet : d2d1: Implement d2d_text_renderer_DrawInlineObject().
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 57eec429c66355b33e2ed42b9f68d4f0e2768532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57eec429c66355b33e2ed42b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:13 2015 +0200 d2d1: Implement d2d_text_renderer_DrawInlineObject(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7d80ef5..61233cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1483,10 +1483,10 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { - FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n", + TRACE("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p.\n", iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); - return E_NOTIMPL; + return IDWriteInlineObject_Draw(object, ctx, iface, origin_x, origin_y, is_sideways, is_rtl, effect); } static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl =

1 0