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

Sebastian Lackner : vcomp/tests: Print the correct variable in ok() message.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 4bcdbe0982f11cf0ee74bf81ac49edceb87becaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcdbe0982f11cf0ee74bf81a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:11:12 2015 +0200 vcomp/tests: Print the correct variable in ok() message. --- dlls/vcomp/tests/vcomp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f021a72..6f9f75e 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -607,7 +607,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -619,7 +619,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -633,7 +633,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -645,7 +645,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end);

1 0

Sebastian Lackner : ntdll: Validate SecurityCookie pointer before accessing cookie value.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 6e66c12c68c6b35ec6ff037e032979fb1dacbe26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e66c12c68c6b35ec6ff037e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:14:23 2015 +0200 ntdll: Validate SecurityCookie pointer before accessing cookie value. --- dlls/ntdll/virtual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 479ca79..2fd8198 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1320,9 +1320,11 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && - loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) + if (loadcfg && loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie) && + (ULONG_PTR)ptr <= loadcfg->SecurityCookie && loadcfg->SecurityCookie <= (ULONG_PTR)ptr + total_size - sizeof(ULONG_PTR)) + { set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); + } /* set the image protections */

1 0

Sebastian Lackner : server: Store correct entry point for first thread.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 905bf79337e04ed31d2823508e90169298049697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905bf79337e04ed31d2823508… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:16:36 2015 +0200 server: Store correct entry point for first thread. --- dlls/ntdll/tests/info.c | 12 ++++++++++-- server/process.c | 1 + server/thread.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 83e8757..4111be4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1713,18 +1713,26 @@ static DWORD WINAPI start_address_thread(void *arg) static void test_thread_start_address(void) { - PRTL_THREAD_START_ROUTINE entry; + PRTL_THREAD_START_ROUTINE entry, expected_entry; + IMAGE_NT_HEADERS *nt; NTSTATUS status; HANDLE thread; + void *module; DWORD ret; + module = GetModuleHandleA(0); + ok(module != NULL, "expected non-NULL address for module\n"); + nt = RtlImageNtHeader(module); + ok(nt != NULL, "expected non-NULL address for NT header\n"); + entry = NULL; ret = 0xdeadbeef; status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry), &ret); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); - ok(entry != NULL, "expected non-NULL entry point\n"); + expected_entry = (void *)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); + ok(entry == expected_entry, "expected %p, got %p\n", expected_entry, entry); entry = (void *)0xdeadbeef; status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, diff --git a/server/process.c b/server/process.c index 0bf7194..7252497 100644 --- a/server/process.c +++ b/server/process.c @@ -1295,6 +1295,7 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; + current->entry_point = req->entry; generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE ); diff --git a/server/thread.c b/server/thread.c index 981bcc1..e1696ba 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1287,7 +1287,7 @@ DECL_HANDLER(init_thread) current->unix_pid = req->unix_pid; current->unix_tid = req->unix_tid; current->teb = req->teb; - current->entry_point = req->entry; + current->entry_point = process->peb ? req->entry : 0; if (!process->peb) /* first thread, initialize the process too */ {

1 0

Henri Verbeet : d2d1: Bitmap values are always premultiplied in practice.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 52c412492faba134f5753ee60cce3040a8e37169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c412492faba134f5753ee60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:55 2015 +0200 d2d1: Bitmap values are always premultiplied in practice. Since creating bitmaps with D2D1_ALPHA_MODE_UNKNOWN or D2D1_ALPHA_MODE_STRAIGHT is not possible, and D2D1_ALPHA_MODE_IGNORE behaves as if alpha == 1.0f. --- dlls/d2d1/brush.c | 3 ++ dlls/d2d1/render_target.c | 16 +++--- dlls/d2d1/tests/d2d1.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c412492faba134f5753…

1 0

Henri Verbeet : d2d1: Properly handle D2D1_ALPHA_MODE_PREMULTIPLIED on render targets.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: c2135dd498dc729deb5ad9f525f7b52c87c7d9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2135dd498dc729deb5ad9f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:56 2015 +0200 d2d1: Properly handle D2D1_ALPHA_MODE_PREMULTIPLIED on render targets. --- dlls/d2d1/render_target.c | 18 +++++-- dlls/d2d1/tests/d2d1.c | 117 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 124 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 925db33..a25b8ea 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1165,7 +1165,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa if (color) c = *color; - c.a = 1.0f; + if (render_target->format.alphaMode == D2D1_ALPHA_MODE_IGNORE) + c.a = 1.0f; + c.r *= c.a; + c.g *= c.a; + c.b *= c.a; buffer_desc.ByteWidth = sizeof(c); buffer_data.pSysMem = &c; @@ -1794,8 +1798,16 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, blend_desc.SrcBlend = D3D10_BLEND_ONE; blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; blend_desc.BlendOp = D3D10_BLEND_OP_ADD; - blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + if (desc->pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) + { + blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + } + else + { + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_INV_SRC_ALPHA; + } blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; if (FAILED(hr = ID3D10Device_CreateBlendState(render_target->device, &blend_desc, &render_target->bs))) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a7c720b..a0c9b11 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -438,29 +438,34 @@ static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL return swapchain; } -static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) +static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { - D2D1_RENDER_TARGET_PROPERTIES desc; ID2D1RenderTarget *render_target; ID2D1Factory *factory; HRESULT hr; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, desc, &render_target); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ID2D1Factory_Release(factory); + + return render_target; +} + +static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) +{ + D2D1_RENDER_TARGET_PROPERTIES desc; desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; - desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; desc.dpiX = 0.0f; desc.dpiY = 0.0f; desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; - hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &render_target); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); - ID2D1Factory_Release(factory); - - return render_target; + return create_render_target_desc(surface, &desc); } static void test_clip(void) @@ -1611,6 +1616,7 @@ static void test_bitmap_formats(void) static void test_alpha_mode(void) { + D2D1_RENDER_TARGET_PROPERTIES rt_desc; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1SolidColorBrush *color_brush; ID2D1BitmapBrush *bitmap_brush; @@ -1672,6 +1678,101 @@ static void test_alpha_mode(void) ID2D1RenderTarget_Clear(rt, NULL); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "48c41aff3a130a17ee210866b2ab7d36763934d5"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 1.0f, 0.0f, 0.0f, 0.25f); + ID2D1RenderTarget_Clear(rt, &color); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "6487e683730fb5a77c1911388d00b04664c5c4e4"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 0.75f); + ID2D1RenderTarget_Clear(rt, &color); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "7a35ba09e43cbaf591388ff1ef8de56157630c98"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + + set_rect(&rect, 0.0f, 0.0f, 160.0f, 120.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 160.0f, 0.0f, 320.0f, 120.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 320.0f, 0.0f, 480.0f, 120.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + ID2D1Bitmap_Release(bitmap); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap); + + set_rect(&rect, 0.0f, 120.0f, 160.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 1.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 160.0f, 120.0f, 320.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 320.0f, 120.0f, 480.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + set_rect(&rect, 0.0f, 240.0f, 160.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 160.0f, 240.0f, 320.0f, 360.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 320.0f, 240.0f, 480.0f, 360.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "14f8ac64b70966c7c3c6281c59aaecdb17c3b16a"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_Release(rt); + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + rt_desc.dpiX = 0.0f; + rt_desc.dpiY = 0.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + rt = create_render_target_desc(surface, &rt_desc); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + ID2D1Bitmap_Release(bitmap); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap); + + ID2D1BitmapBrush_Release(bitmap_brush); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + ID2D1BitmapBrush_SetExtendModeX(bitmap_brush, D2D1_EXTEND_MODE_WRAP); + ID2D1BitmapBrush_SetExtendModeY(bitmap_brush, D2D1_EXTEND_MODE_WRAP); + + ID2D1SolidColorBrush_Release(color_brush); + set_color(&color, 0.0f, 1.0f, 0.0f, 0.75f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); match = compare_surface(surface, "b44510bf2d2e61a8d7c0ad862de49a471f1fd13f"); ok(match, "Surface does not match.\n");

1 0

Henri Verbeet : d2d1: Fix the TRACE in d2d_bitmap_Release().
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 4371946d949d547f01059d16b31e9e73e39637a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4371946d949d547f01059d16b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:57 2015 +0200 d2d1: Fix the TRACE in d2d_bitmap_Release(). --- dlls/d2d1/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index be03b66..080663c 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); ULONG refcount = InterlockedDecrement(&bitmap->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) {

1 0

Henri Verbeet : d2d1: Don' t pass NULL resource data to ID3D10Device_CreateTexture2D().
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: e5c793e637784ac017f99b25bd4a53a98ea95116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c793e637784ac017f99b25b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:58 2015 +0200 d2d1: Don't pass NULL resource data to ID3D10Device_CreateTexture2D(). --- dlls/d2d1/bitmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 080663c..00359cb 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -228,7 +228,8 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, &resource_data, &texture))) + if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, + src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : d2d1: Implement d2d_stroke_style_GetFactory().
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 68ce000df7d7f4011d65d44cfdbc62a0a6c71e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ce000df7d7f4011d65d44cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:59 2015 +0200 d2d1: Implement d2d_stroke_style_GetFactory(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/stroke.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 96a0bb8..cf98ff8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -164,6 +164,8 @@ struct d2d_stroke_style { ID2D1StrokeStyle ID2D1StrokeStyle_iface; LONG refcount; + + ID2D1Factory *factory; }; void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 81d3dde..167db67 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -65,16 +65,21 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(style->factory); HeapFree(GetProcessHeap(), 0, style); + } return refcount; } static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = style->factory); } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) @@ -162,4 +167,5 @@ void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; + ID2D1Factory_AddRef(style->factory = factory); }

1 0

Piotr Caban : user32: Test GetIconInfo on other process cursor.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 888ffb1134846c67032c04ab7c91b8d2476a6e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888ffb1134846c67032c04ab7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 30 09:36:52 2015 +0200 user32: Test GetIconInfo on other process cursor. --- dlls/user32/tests/cursoricon.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 54d7963..4b6b792 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -308,21 +308,33 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL ret; - DWORD error; - switch (msg) { /* Destroy the cursor. */ case WM_USER+1: + { + HCURSOR cursor = (HCURSOR)lParam; + ICONINFO info; + BOOL ret; + DWORD error; + + memset(&info, 0, sizeof(info)); + ret = GetIconInfo(cursor, &info); + todo_wine ok(ret, "GetIconInfoEx failed with error %u\n", GetLastError()); + todo_wine ok(info.hbmColor != NULL, "info.hmbColor was not set\n"); + todo_wine ok(info.hbmMask != NULL, "info.hmbColor was not set\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + SetLastError(0xdeadbeef); - ret = DestroyCursor((HCURSOR) lParam); + ret = DestroyCursor(cursor); error = GetLastError(); ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); return TRUE; + } case WM_DESTROY: PostQuitMessage(0); return 0;

1 0

Sebastian Lackner : wineconsole: Consistently return nonzero exitcode on error.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 29b55a5cae70c270a2b02b0ab25a4674f0ebea5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b55a5cae70c270a2b02b0ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:34:34 2015 +0200 wineconsole: Consistently return nonzero exitcode on error. --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 2903b80..7413c8f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1018,7 +1018,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) WCCURSES_Resize(data); - if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; + if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 5c8c2c0..4725ebd 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1382,7 +1382,7 @@ static int WCUSER_MainLoop(struct inner_data* data) * so GetMessage would lead to delayed processing */ while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_QUIT) return 0; + if (msg.message == WM_QUIT) return 1; WINE_TRACE("dispatching msg %04x\n", msg.message); DispatchMessageW(&msg); } diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bdd5629..b8b517a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -720,7 +720,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna * * Spawn the child process when invoked with wineconsole foo bar */ -static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) +static int WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) { PROCESS_INFORMATION info; STARTUPINFOW startup; @@ -743,20 +743,22 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) { WINE_ERR("Can't dup handles\n"); /* no need to delete handles, we're exiting the program anyway */ - return FALSE; + return 1; } done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); + if (done) + { + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } /* we no longer need the handles passed to the child for the console */ CloseHandle(startup.hStdInput); CloseHandle(startup.hStdOutput); CloseHandle(startup.hStdError); - CloseHandle(info.hProcess); - CloseHandle(info.hThread); - - return done; + return !done; } struct wc_init { @@ -852,9 +854,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh { case from_event: /* case of wineconsole <evt>, signal process that created us that we're up and running */ - if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 0; - ret = SetEvent(wci.event); - if (!ret) WINE_ERR("SetEvent failed.\n"); + if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 1; + ret = !SetEvent(wci.event); + if (ret != 0) WINE_ERR("SetEvent failed.\n"); break; case from_process_name: { @@ -865,30 +867,30 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) - return 0; + return 1; MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) { HeapFree(GetProcessHeap(), 0, buffer); - return 0; + return 1; } ret = WINECON_Spawn(data, buffer); HeapFree(GetProcessHeap(), 0, buffer); - if (!ret) + if (ret != 0) { WINECON_Delete(data); printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_a(wci.ptr)); - return 0; + return ret; } } break; default: - return 0; + return 1; } - if (ret) + if (!ret) { WINE_TRACE("calling MainLoop.\n"); ret = data->fnMainLoop(data);

1 0