January 2016 - Wine-Commits

Nikolay Sivov : dwrite: Fix strikethrough baseline origin.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 18b0ca3fe3325d9666186a7c87d9b10b301a01b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b0ca3fe3325d9666186a7c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:09 2016 +0300 dwrite: Fix strikethrough baseline origin. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6d62b82..daa56e9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3002,8 +3002,8 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(s, &This->strikethrough, struct layout_strikethrough, entry) { IDWriteTextRenderer_DrawStrikethrough(renderer, context, - s->run->origin_x, - SNAP_COORD(s->run->origin_y), + s->run->origin_x + run->align_dx + origin_x, + SNAP_COORD(s->run->origin_y + origin_y), &s->s, s->run->effect); }

1 0

Andrew Eikum : xaudio2_1: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 719d226392b77b474bc000aa7311b7861b8aa854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719d226392b77b474bc000aa7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:23 2016 -0600 xaudio2_1: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_1/Makefile.in | 7 ++++- dlls/xaudio2_1/xaudio2_1.spec | 2 +- dlls/xaudio2_1/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_1/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index ddfce47..09869ac 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} diff --git a/configure.ac b/configure.ac index 60e2f28..cb3de07 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index 282513b..7aab503 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/xaudio2_1.spec b/dlls/xaudio2_1/xaudio2_1.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_1/xaudio2_1.spec +++ b/dlls/xaudio2_1/xaudio2_1.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl deleted file mode 100644 index 80fe781..0000000 --- a/dlls/xaudio2_1/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#pragma makedep register - -[ - helpstring("XAudio2.1 Class"), - threading(both), - uuid(e21a7345-eb21-468e-be50-804db97cf708) -] -coclass XAudio21 { interface IXAudio22; } - -[ - helpstring("XAudio2.1 AudioReverb Class"), - threading(both), - uuid(f4769300-b949-4df9-b333-00d33932e9a6) -] -coclass AudioReverb21 { interface IXAPO; } - -[ - helpstring("XAudio2.1 AudioVolumeMeter Class"), - threading(both), - uuid(c1e3f122-a2ea-442c-854f-20d98f8357a1) -] -coclass AudioVolumeMeter21 { interface IXAPO; } diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_1/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 27b74c9..6e460ac 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -234,3 +234,26 @@ coclass AudioReverb22 { interface IXAPO; } ] coclass AudioVolumeMeter22 { interface IXAPO; } #endif /* XAUDIO2_VER == 2 */ + +#if XAUDIO2_VER == 1 +[ + helpstring("XAudio2.1 Class"), + threading(both), + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { interface IXAudio22; } + +[ + helpstring("XAudio2.1 AudioReverb Class"), + threading(both), + uuid(f4769300-b949-4df9-b333-00d33932e9a6) +] +coclass AudioReverb21 { interface IXAPO; } + +[ + helpstring("XAudio2.1 AudioVolumeMeter Class"), + threading(both), + uuid(c1e3f122-a2ea-442c-854f-20d98f8357a1) +] +coclass AudioVolumeMeter21 { interface IXAPO; } +#endif /* XAUDIO2_VER == 1 */

1 0

Andrew Eikum : xaudio2_0: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: a6126ea2844748b00bd5e931deb3819898b8df42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6126ea2844748b00bd5e931d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:26 2016 -0600 xaudio2_0: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_0/Makefile.in | 7 ++++- dlls/xaudio2_0/xaudio2_0.spec | 2 +- dlls/xaudio2_0/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_0/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index 09869ac..339a734 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} diff --git a/configure.ac b/configure.ac index cb3de07..3712906 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index cc9d161..c0e31e3 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_0/xaudio2_0.spec b/dlls/xaudio2_0/xaudio2_0.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_0/xaudio2_0.spec +++ b/dlls/xaudio2_0/xaudio2_0.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_0/xaudio_classes.idl b/dlls/xaudio2_0/xaudio_classes.idl deleted file mode 100644 index 08693fc..0000000 --- a/dlls/xaudio2_0/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#pragma makedep register - -[ - helpstring("XAudio2.0 Class"), - threading(both), - uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) -] -coclass XAudio20 { interface IXAudio20; } - -[ - helpstring("XAudio2.0 AudioReverb Class"), - threading(both), - uuid(6f6ea3a9-2cf5-41cf-91c1-2170b1540063) -] -coclass AudioReverb20 { interface IXAPO; } - -[ - helpstring("XAudio2.0 AudioVolumeMeter Class"), - threading(both), - uuid(c0c56f46-29b1-44e9-9939-a32ce86867e2) -] -coclass AudioVolumeMeter20 { interface IXAPO; } diff --git a/dlls/xaudio2_0/xaudio_dll.c b/dlls/xaudio2_0/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_0/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 6e460ac..28c8667 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -257,3 +257,26 @@ coclass AudioReverb21 { interface IXAPO; } ] coclass AudioVolumeMeter21 { interface IXAPO; } #endif /* XAUDIO2_VER == 1 */ + +#if XAUDIO2_VER == 0 +[ + helpstring("XAudio2.0 Class"), + threading(both), + uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) +] +coclass XAudio20 { interface IXAudio20; } + +[ + helpstring("XAudio2.0 AudioReverb Class"), + threading(both), + uuid(6f6ea3a9-2cf5-41cf-91c1-2170b1540063) +] +coclass AudioReverb20 { interface IXAPO; } + +[ + helpstring("XAudio2.0 AudioVolumeMeter Class"), + threading(both), + uuid(c0c56f46-29b1-44e9-9939-a32ce86867e2) +] +coclass AudioVolumeMeter20 { interface IXAPO; } +#endif /* XAUDIO2_VER == 0 */

1 0

Nikolay Sivov : dwrite: Start new effective run on strikethrough, underline or effect change.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: a4562cca50d9587b7eafacd4f99b0b9ecd08f6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4562cca50d9587b7eafacd4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:05 2016 +0300 dwrite: Start new effective run on strikethrough, underline or effect change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 63 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 02772ff..097adee 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -986,10 +986,47 @@ static inline BOOL layout_is_erun_rtl(const struct layout_effective_run *erun) return erun->run->u.regular.run.bidiLevel & 1; } +/* A set of parameters that additionally slits resulting runs. It happens after shaping and all text processing, + no glyph changes are possible. It's understandable for effects, because DrawGlyphRun() will report them, + but it also happens for decorations, so every effective run has uniform underline/strikethough/effect tuple. */ +struct layout_final_splitting_params { + BOOL strikethrough; + BOOL underline; + IUnknown *effect; +}; + +static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *layout, UINT32 pos) +{ + struct layout_range_header *h = get_layout_range_header_by_pos(&layout->strike_ranges, pos); + return ((struct layout_range_bool*)h)->value; +} + +static inline BOOL layout_get_underline_from_pos(struct dwrite_textlayout *layout, UINT32 pos) +{ + struct layout_range_header *h = get_layout_range_header_by_pos(&layout->ranges, pos); + return ((struct layout_range_bool*)h)->value; +} + +static void layout_splitting_params_from_pos(struct dwrite_textlayout *layout, UINT32 pos, + struct layout_final_splitting_params *params) +{ + params->strikethrough = layout_get_strikethrough_from_pos(layout, pos); + params->underline = layout_get_underline_from_pos(layout, pos); + params->effect = layout_get_effect_from_pos(layout, pos); +} + +static BOOL is_same_splitting_params(const struct layout_final_splitting_params *left, + const struct layout_final_splitting_params *right) +{ + return left->strikethrough == right->strikethrough && + left->underline == right->underline && + left->effect == right->effect; +} + /* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index, 'cluster_count' indicates how many clusters to add, including first one. */ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster, - UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough) + UINT32 cluster_count, UINT32 line, FLOAT origin_x, struct layout_final_splitting_params *params) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; UINT32 i, start, length, last_cluster; @@ -1073,7 +1110,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* Strikethrough style is guaranteed to be consistent within effective run, it's width equals to run width, thikness and offset are derived from font metrics, rest of the values are from layout or run itself */ - if (strikethrough) { + if (params->strikethrough) { DWRITE_FONT_METRICS metrics = { 0 }; struct layout_strikethrough *s; @@ -1132,11 +1169,6 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ return S_OK; } -static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *layout, UINT32 pos) -{ - struct layout_range_header *h = get_layout_range_header_by_pos(&layout->strike_ranges, pos); - return ((struct layout_range_bool*)h)->value; -} static inline struct layout_effective_run *layout_get_next_erun(struct dwrite_textlayout *layout, const struct layout_effective_run *cur) @@ -1390,9 +1422,11 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) } } + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; + struct layout_final_splitting_params prev_params, params; struct layout_effective_inline *inrun; struct layout_effective_run *erun; const struct layout_run *run; @@ -1400,7 +1434,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) FLOAT width, origin_x, origin_y; UINT32 i, start, line, textpos; HRESULT hr; - BOOL s[2]; if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) return S_OK; @@ -1414,17 +1447,19 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) line = 0; run = layout->clusters[0].run; memset(&metrics, 0, sizeof(metrics)); - s[0] = s[1] = layout_get_strikethrough_from_pos(layout, 0); + + layout_splitting_params_from_pos(layout, 0, &params); + prev_params = params; for (i = 0, start = 0, textpos = 0, width = 0.0f; i < layout->cluster_count; i++) { BOOL overflow; - s[1] = layout_get_strikethrough_from_pos(layout, textpos); + layout_splitting_params_from_pos(layout, textpos, &params); /* switched to next nominal run, at this point all previous pending clusters are already checked for layout line overflow, so new effective run will fit in current line */ - if (run != layout->clusters[i].run || s[0] != s[1]) { - hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]); + if (run != layout->clusters[i].run || !is_same_splitting_params(&prev_params, &params)) { + hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, &prev_params); if (FAILED(hr)) return hr; origin_x += is_rtl ? -get_cluster_range_width(layout, start, i) : @@ -1452,7 +1487,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, &prev_params); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */ @@ -1524,7 +1559,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) width += layout->clustermetrics[i].width; } - s[0] = s[1]; + prev_params = params; textpos += layout->clustermetrics[i].length; }

1 0

Thomas Faller : dde: Fix use-after-free.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 4e7a7d01ffd1bbbb07acfe08ebf74046ad1f9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7a7d01ffd1bbbb07acfe08e… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Jan 12 22:06:30 2016 +0100 dde: Fix use-after-free. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dde_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 633331d..989131c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -778,7 +778,7 @@ static WDML_QUEUE_STATE WDML_HandlePokeReply(WDML_CONV* pConv, MSG* msg, WDML_XA GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;

1 0

Francois Gouget : kernel32/tests: Help the tests portably declare printf() -syle functions.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: f6dc7c88bac10b4f44cc195bc60407b03c861a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dc7c88bac10b4f44cc195bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:42:54 2016 +0100 kernel32/tests: Help the tests portably declare printf()-syle functions. To do so they can now use the WINETEST_PRINTF_ATTR() macro. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 8 +------- include/wine/test.h | 21 ++++++++------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 326a903..73320c6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -30,12 +30,6 @@ #define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) #endif -#ifdef __GNUC__ -#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) -#else -#define PRINTF_ATTR(fmt,args) -#endif - #define child_ok (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_child_ok static int myARGC; @@ -49,7 +43,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; -static void PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) +static void WINETEST_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) { va_list valist; diff --git a/include/wine/test.h b/include/wine/test.h index a5b67a0..bed44f9 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -98,20 +98,15 @@ extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ) extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ +# define WINETEST_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +# define WINETEST_PRINTF_ATTR(fmt,args) +#endif -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); -extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); - -#else /* __GNUC__ */ - -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); -extern void __winetest_cdecl winetest_skip( const char *msg, ... ); -extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); -extern void __winetest_cdecl winetest_trace( const char *msg, ... ); - -#endif /* __GNUC__ */ +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) WINETEST_PRINTF_ATTR(2,3); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); #define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip

1 0

Francois Gouget : shell32/tests: Tweak some overly optimistic ok() messages.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: f816bc93b06d2fd7f9ef0404ca5d88fc5495943e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f816bc93b06d2fd7f9ef0404c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 13 12:41:15 2016 +0100 shell32/tests: Tweak some overly optimistic ok() messages. ShellExecute() is more likely to have returned an unexpected error code than it is to have succeeded. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f67206d..3acfe4d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -951,7 +951,7 @@ static void test_lpFile_parsed(void) /* error should be SE_ERR_FNF, not SE_ERR_NOASSOC */ sprintf(fileA, "\"%s\\drawback_file.noassoc\" foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* ""command"" not works on wine (and real win9x and w2k) */ sprintf(fileA, "\"\"%s\\simple.shlexec\"\"", tmpdir); @@ -966,11 +966,11 @@ static void test_lpFile_parsed(void) /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ rc=shell_execute(NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* quoted */ rc=shell_execute(NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* test SEE_MASK_DOENVSUBST works */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, @@ -2114,7 +2114,7 @@ static void test_exes(void) { rc=shell_execute(NULL, filename, params, NULL); todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%lu\n", shell_call, rc); + ok(rc==SE_ERR_NOASSOC, "%s returned %lu\n", shell_call, rc); } } }

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayGetDim().
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 332dd07fad031a51f5d921d6d348f3345b9ae061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332dd07fad031a51f5d921d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:47 2016 +0300 ole2disp: Implement SafeArrayGetDim(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 5831d86..0c033cd 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -90,6 +90,15 @@ static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetDim [OLE2DISP.17] + */ +USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cDims; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 919583d..1fd2b0b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -14,7 +14,7 @@ 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY -17 stub SAFEARRAYGETDIM +17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 stub SAFEARRAYGETELEMSIZE 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND

1 0

Jacek Caban : mshtml/tests: Fixed location tests on IE11.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: f9036324278650ed72b07f3625f7920894f9ae22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9036324278650ed72b07f362… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 13 16:32:28 2016 +0100 mshtml/tests: Fixed location tests on IE11. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmllocation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 8bf5517..ee241e7 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -215,7 +215,8 @@ static void test_port(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_port(loc, &str); ok(hres == S_OK, "%s: get_port failed: 0x%08x\n", test->name, hres); if(hres == S_OK) - ok(str_eq_wa(str, test->port), + ok(str_eq_wa(str, test->port) + || (!str && !*test->port), /* IE11 */ "%s: expected retrieved port to be L\"%s\", was: %s\n", test->name, test->port, wine_dbgstr_w(str)); SysFreeString(str);

1 0

Hans Leidekker : bcrypt: Add support for SHA hashes on Linux using GnuTLS.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 2cd8d273734cfbf3095d7937398676fdba635051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd8d273734cfbf3095d79373… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:35 2016 +0100 bcrypt: Add support for SHA hashes on Linux using GnuTLS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 167 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 87e1429..54814a0 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,5 +1,6 @@ MODULE = bcrypt.dll IMPORTS = advapi32 +EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ bcrypt_main.c diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9cc5227..227399f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -18,10 +18,14 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H #include <CommonCrypto/CommonDigest.h> +#elif defined(SONAME_LIBGNUTLS) +#include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #endif #include "ntstatus.h" @@ -32,10 +36,88 @@ #include "bcrypt.h" #include "wine/debug.h" +#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); +static HINSTANCE instance; + +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +static void *libgnutls_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gnutls_global_deinit); +MAKE_FUNCPTR(gnutls_global_init); +MAKE_FUNCPTR(gnutls_global_set_log_function); +MAKE_FUNCPTR(gnutls_global_set_log_level); +MAKE_FUNCPTR(gnutls_hash); +MAKE_FUNCPTR(gnutls_hash_deinit); +MAKE_FUNCPTR(gnutls_hash_init); +MAKE_FUNCPTR(gnutls_perror); +#undef MAKE_FUNCPTR + +static void gnutls_log( int level, const char *msg ) +{ + TRACE( "<%d> %s", level, msg ); +} + +static BOOL gnutls_initialize(void) +{ + int ret; + + if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "failed to load libgnutls, no support for crypto hashes\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + { \ + ERR( "failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(gnutls_global_deinit) + LOAD_FUNCPTR(gnutls_global_init) + LOAD_FUNCPTR(gnutls_global_set_log_function) + LOAD_FUNCPTR(gnutls_global_set_log_level) + LOAD_FUNCPTR(gnutls_hash); + LOAD_FUNCPTR(gnutls_hash_deinit); + LOAD_FUNCPTR(gnutls_hash_init); + LOAD_FUNCPTR(gnutls_perror) +#undef LOAD_FUNCPTR + + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) + { + pgnutls_perror( ret ); + goto fail; + } + + if (TRACE_ON( bcrypt )) + { + pgnutls_global_set_log_level( 4 ); + pgnutls_global_set_log_function( gnutls_log ); + } + + return TRUE; + +fail: + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; + return FALSE; +} + +static void gnutls_uninitialize(void) +{ + pgnutls_global_deinit(); + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; +} +#endif /* SONAME_LIBGNUTLS && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { @@ -203,7 +285,7 @@ static NTSTATUS hash_init( struct hash *hash ) return STATUS_SUCCESS; } -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) { switch (hash->alg_id) { @@ -225,8 +307,9 @@ static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) default: ERR( "unhandled id %u\n", hash->alg_id ); - break; + return STATUS_NOT_IMPLEMENTED; } + return STATUS_SUCCESS; } static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) @@ -255,6 +338,58 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) } return STATUS_SUCCESS; } +#elif defined(SONAME_LIBGNUTLS) +struct hash +{ + struct object hdr; + enum alg_id alg_id; + gnutls_hash_hd_t handle; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + gnutls_digest_algorithm_t alg; + + if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + + switch (hash->alg_id) + { + case ALG_ID_SHA1: + alg = GNUTLS_DIG_SHA1; + break; + + case ALG_ID_SHA256: + alg = GNUTLS_DIG_SHA256; + break; + + case ALG_ID_SHA384: + alg = GNUTLS_DIG_SHA384; + break; + + case ALG_ID_SHA512: + alg = GNUTLS_DIG_SHA512; + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (pgnutls_hash_init( &hash->handle, alg )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + if (pgnutls_hash( hash->handle, input, size )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + pgnutls_hash_deinit( hash->handle, output ); + return STATUS_SUCCESS; +} #else struct hash { @@ -268,9 +403,10 @@ static NTSTATUS hash_init( struct hash *hash ) return STATUS_NOT_IMPLEMENTED; } -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) { ERR( "support for hashes not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) @@ -484,8 +620,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!input) return STATUS_INVALID_PARAMETER; - hash_update( hash, input, size ); - return STATUS_SUCCESS; + return hash_update( hash, input, size ); } NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) @@ -499,3 +634,25 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON return hash_finish( hash, output, size ); } + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_initialize(); +#endif + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_uninitialize(); +#endif + break; + } + return TRUE; +}

1 0