February 2017 - Wine-Commits

Nikolay Sivov : d2d1: Support strikethrough in DrawText()/DrawTextLayout() .
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: bfb953894e96bf63badb2e7f73e412b64b743e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb953894e96bf63badb2e7f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 14:47:14 2017 +0300 d2d1: Support strikethrough in DrawText()/DrawTextLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc705ee..c773fdf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1845,10 +1845,31 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; + struct d2d_draw_text_layout_ctx *context = ctx; + D2D1_POINT_2F start, end; + ID2D1Brush *brush; + float thickness; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p.\n", iface, ctx, baseline_origin_x, baseline_origin_y, strikethrough, effect); - return E_NOTIMPL; + /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ + thickness = max(96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)), + strikethrough->thickness); + + brush = d2d_draw_get_text_brush(context, effect); + + start.x = baseline_origin_x; + start.y = baseline_origin_y + strikethrough->offset + thickness / 2.0f; + end.x = start.x + strikethrough->width; + end.y = start.y; + d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + + ID2D1Brush_Release(brush); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx,

1 0

André Hentschel : user32: Fix some spec file entries.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: b05c000c915dccd5317e39dc0270970744d42f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05c000c915dccd5317e39dc0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:05 2017 +0100 user32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c2d43e7..6f2703a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -90,14 +90,14 @@ @ stdcall CreateDialogIndirectParamA(long ptr long ptr long) @ stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long) @ stdcall CreateDialogIndirectParamW(long ptr long ptr long) -@ stdcall CreateDialogParamA(long ptr long ptr long) -@ stdcall CreateDialogParamW(long ptr long ptr long) +@ stdcall CreateDialogParamA(long str long ptr long) +@ stdcall CreateDialogParamW(long wstr long ptr long) @ stdcall CreateIcon(long long long long long ptr ptr) @ stdcall CreateIconFromResource (ptr long long long) @ stdcall CreateIconFromResourceEx(ptr long long long long long long) @ stdcall CreateIconIndirect(ptr) -@ stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) -@ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) +@ stdcall CreateMDIWindowA(str str long long long long long long long long) +@ stdcall CreateMDIWindowW(wstr wstr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() # @ stub CreateSystemThreads @@ -521,10 +521,10 @@ @ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) @ stdcall NotifyWinEvent(long long long long) @ stdcall OemKeyScan(long) -@ stdcall OemToCharA(ptr ptr) +@ stdcall OemToCharA(str ptr) @ stdcall OemToCharBuffA(ptr ptr long) @ stdcall OemToCharBuffW(ptr ptr long) -@ stdcall OemToCharW(ptr ptr) +@ stdcall OemToCharW(str ptr) @ stdcall OffsetRect(ptr long long) @ stdcall OpenClipboard(long) @ stdcall OpenDesktopA(str long long long) @@ -631,7 +631,7 @@ @ stub SetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) -@ stdcall SetDeskWallPaper(ptr) +@ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap @ stdcall SetDlgItemInt(long long long long)

1 0

André Hentschel : kernel32: Fix some more spec file entries.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 88eef73fc876789e32a7cb82cf39c1b18736e398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88eef73fc876789e32a7cb82c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:07 2017 +0100 kernel32: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a6cefef..388f7c0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1349,8 +1349,8 @@ @ stdcall SetConsoleFont(long long) @ stub SetConsoleHardwareState @ stdcall SetConsoleIcon(ptr) -@ stdcall SetConsoleInputExeNameA(ptr) -@ stdcall SetConsoleInputExeNameW(ptr) +@ stdcall SetConsoleInputExeNameA(str) +@ stdcall SetConsoleInputExeNameW(wstr) @ stdcall SetConsoleKeyShortcuts(long long ptr long) @ stub SetConsoleLocalEUDC @ stub SetConsoleMaximumWindowSize

1 0

André Hentschel : gdiplus: Fix GdipCreateStreamOnFile spec file entry.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 7f2543180ea97958add330c05bc9ee62d4ebb0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2543180ea97958add330c05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:00 2017 +0100 gdiplus: Fix GdipCreateStreamOnFile spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8cf5ab3..dd8d909 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -120,7 +120,7 @@ 120 stdcall GdipCreateRegionRectI(ptr ptr) 121 stdcall GdipCreateRegionRgnData(ptr long ptr) 122 stdcall GdipCreateSolidFill(long ptr) -123 stdcall GdipCreateStreamOnFile(ptr long ptr) +123 stdcall GdipCreateStreamOnFile(wstr long ptr) 124 stdcall GdipCreateStringFormat(long long ptr) 125 stdcall GdipCreateTexture2(ptr long float float float float ptr) 126 stdcall GdipCreateTexture2I(ptr long long long long long ptr)

1 0

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_clear().
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 97266441f4756024821b71afb61c7ba6f0b26fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=97266441f4756024821b71afb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:35 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fa7c6dd..c686181 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -387,17 +387,16 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { + const struct wined3d_state *state = &cs->state; const struct wined3d_cs_clear *op = data; - const struct wined3d_state *state; struct wined3d_device *device; unsigned int i; RECT draw_rect; device = cs->device; - state = &device->state; wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - cs->state.fb, op->rect_count, op->rects, &draw_rect, op->flags, + state->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET)

1 0

Huw Davies : widl: Add missing width and alignment for VARIANT.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 5a06b6b035b105d8ead9f64698f7b458fa9cfa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a06b6b035b105d8ead9f6469… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Feb 25 10:09:14 2017 +0000 widl: Add missing width and alignment for VARIANT. Spotted by André Hentschel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7904e45..4b09317 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -885,6 +885,8 @@ static int encode_type( case VT_VARIANT: *encoded_type = default_type; + *width = 8 + 2 * pointer_size; + *alignment = 8; break; case VT_LPSTR:

1 0

Nikolay Sivov : d3d8: Fix debug messages.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 772290bd1fbe681f23874ee00ce265ea4fec0511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772290bd1fbe681f23874ee00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 14:37:58 2017 +0300 d3d8: Fix debug messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d7a933b..e255392 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1683,7 +1683,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); if (FAILED(hr)) { - WARN("IWineD3DDevice_EndStateBlock returned an error\n"); + WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -1799,7 +1799,7 @@ static HRESULT WINAPI d3d8_device_CreateStateBlock(IDirect3DDevice8 *iface, if (FAILED(hr)) { wined3d_mutex_unlock(); - ERR("IWineD3DDevice_CreateStateBlock failed, hr %#x\n", hr); + ERR("Failed to create the state block, hr %#x\n", hr); return hr; }

1 0

Bruno Jesus : ws2_32: Cope with NULL address in connect() call.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: dcf258685e9deb72c2b7d4bae9d0c667b727d090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf258685e9deb72c2b7d4bae… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sun Feb 26 22:25:43 2017 -0300 ws2_32: Cope with NULL address in connect() call. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++++-- dlls/ws2_32/tests/sock.c | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3c8c806..f0e8f2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1731,14 +1731,17 @@ static inline BOOL supported_protocol(int protocol) /**********************************************************************/ -/* Returns the length of the converted address if successful, 0 if it was too small to - * start with. +/* Returns the length of the converted address if successful, 0 if it was too + * small to start with or unknown family or invalid address buffer. */ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, union generic_unix_sockaddr *uaddr) { unsigned int uaddrlen = 0; + if (!wsaddr) + return 0; + switch (wsaddr->sa_family) { #ifdef HAS_IPX diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 59a23d7..b42c078 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5841,6 +5841,11 @@ static void test_events(int useMessages) goto end; } + SetLastError(0xdeadbeef); + ret = connect(src, NULL, 0); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ok(GetLastError() == WSAEFAULT, "expected 10014, got %d\n", GetLastError()); + ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); if (ret == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) {

1 0

Henri Verbeet : wined3d: Get rid of some redundant "texture" accesses in texture_resource_sub_resource_map().
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 7b18ff5abb76fd3b5570c6a634fc314d7e27606c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b18ff5abb76fd3b5570c6a63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:31 2017 +0100 wined3d: Get rid of some redundant "texture" accesses in texture_resource_sub_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 20a6c0e..b3e5659 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1832,16 +1832,15 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", - wined3d_debug_location(texture->resource.map_binding)); - if ((ret = wined3d_texture_prepare_location(texture, sub_resource_idx, - context, texture->resource.map_binding))) - wined3d_texture_validate_location(texture, sub_resource_idx, texture->resource.map_binding); + wined3d_debug_location(resource->map_binding)); + if ((ret = wined3d_texture_prepare_location(texture, sub_resource_idx, context, resource->map_binding))) + wined3d_texture_validate_location(texture, sub_resource_idx, resource->map_binding); } else { if (resource->usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic texture without WINED3D_MAP_DISCARD.\n"); - ret = wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); + ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); } if (!ret) @@ -1852,10 +1851,10 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour } if (!(flags & WINED3D_MAP_READONLY) - && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_texture_map_bo_address(&data, sub_resource->size, gl_info, GL_PIXEL_UNPACK_BUFFER, flags); TRACE("Base memory pointer %p.\n", base_memory);

1 0

André Hentschel : mscoree: Fix some spec file entries.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: aa91a9a3ac1c6b27f5716cba6c63489bbb92d68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa91a9a3ac1c6b27f5716cba6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:22:57 2017 +0100 mscoree: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 93248e2..3715b7c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -38,7 +38,7 @@ @ stub EEDllGetClassObjectFromClass @ stub EEDllRegisterServer @ stub EEDllUnregisterServer -@ stdcall GetAssemblyMDImport(ptr ptr ptr) +@ stdcall GetAssemblyMDImport(wstr ptr ptr) @ stub GetCORRequiredVersion @ stub GetCORRootDirectory @ stdcall GetCORSystemDirectory(ptr long ptr) @@ -69,7 +69,7 @@ @ stub GetXMLElement @ stub GetXMLElementAttribute @ stub GetXMLObject -@ stdcall LoadLibraryShim(ptr ptr ptr ptr) +@ stdcall LoadLibraryShim(wstr wstr ptr ptr) @ stub LoadLibraryWithPolicyShim @ stdcall LoadStringRCEx(long long ptr long long ptr) @ stdcall LockClrVersion(ptr ptr ptr) @@ -116,4 +116,4 @@ @ stdcall _CorExeMain2(ptr long ptr ptr ptr) @ stdcall _CorExeMain() @ stdcall _CorImageUnloading(ptr) -@ stdcall _CorValidateImage(ptr ptr) +@ stdcall _CorValidateImage(ptr wstr)

1 0