October 2017 - Wine-Commits

Fabian Maurer : regedit: Don't crash if REG_SZ is empty.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 8e9a469e9c24ee3aa05e8fe5b4a728295bb79e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9a469e9c24ee3aa05e8fe5b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 2 08:05:21 2017 +0000 regedit: Don't crash if REG_SZ is empty. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 6e6ea47..508a8a3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1243,11 +1243,12 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) { - size_t len, line_len; + size_t len = 0, line_len; WCHAR *str; static const WCHAR fmt[] = {'"','%','s','"',0}; - len = size / sizeof(WCHAR) - 1; + if (size) + len = size / sizeof(WCHAR) - 1; str = REGPROC_escape_string(data, len, &line_len); *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); sprintfW(*buf, fmt, str);

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: c57895c39896e269663759ce60cb41baeeb1f0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57895c39896e269663759ce6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Sep 30 10:57:56 2017 +0300 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 4109090..b2dc9ed 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -10,6 +10,7 @@ avulla voidaan myös kääntää Windows-koodia natiiveiksi Unix-ohjelmiksi. Wine on vapaa ohjelma, ja se on julkaistu GNU LGPL:n alaisena; lisätietoja lisenssistä on englanniksi tiedostossa LICENSE. + 2. PIKAOPAS Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: @@ -71,12 +72,9 @@ Perusvaatimukset: Valinnaisia tukikirjastoja: configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä - paketit ovat hyödyksi. + paketit ovat hyödyksi. 64-bittisissä järjestelmissä täytyy varmistaa, että + kirjastoista on asennettu 32-bittiset versiot. - 64-bittisissä järjestelmissä täytyy olla kirjastojen 32-bittiset versiot - 32-bittistä Wineä varten. Sivulla http://wiki.winehq.org/WineOn64bit - kerrotaan tästä lisää. Sivulla http://wiki.winehq.org/Wine64 kerrotaan - 64-bittisen Winen kääntämisestä (erikseen tai 32-bittisen version kanssa). 4. KÄÄNTÄMINEN @@ -95,6 +93,7 @@ käännösprosessiin voi lisätä. Lisätietoja on osoitteessa https://wiki.winehq.org/Building_Wine + 5. ASENNUS Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut

1 0

Akihiro Sagawa : readme: Update Japanese translation.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: a71888cd43f71469eeeb65afef883eaf8955223c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71888cd43f71469eeeb65afe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 1 21:23:11 2017 +0900 readme: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ja | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/documentation/README.ja b/documentation/README.ja index f44d371..5d1fec1 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -13,12 +13,11 @@ Wineはフリーソフトウェアで、GNU LGPLのもとでリリースされ 2. クイックスタート -ソースからコンパイルするときにはいつでも、Wineをビルドしインストールするのに -Wine Installerを使うことが推奨されます。（このファイル[訳注: README.jaではなく -READMEというファイル]を含む）Wineソースのトップレベルディレクトリから、 -以下を実行してください: +Wineソースのトップレベルディレクトリ（このファイル[訳注:README.jaではなく +READMEというファイル]を含むディレクトリ）から、以下を実行してください: -./tools/wineinstall +./configure +make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 @@ -78,18 +77,14 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。 + http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + ラットフォームでは、これらライブラリの32ビットバージョンをインストールした + ことをよく確認してください。 - 64ビットプラットフォームでは、Wineを32ビットでコンパイルした場合（デフォル - ト）、これらライブラリの32ビットバージョンをインストールしたことをよく確認 - してください。詳細はhttp://wiki.winehq.org/WineOn64bitを参照してください。 - 真の64ビットWine（または32ビットと64ビットが混在したWine配置）を必要とする - 場合は、詳細についてhttp://wiki.winehq.org/Wine64を参照してください。 4. コンパイル -wineinstallを使わないことを選択した場合、Wineをビルドするには以下のコマンドを -実行してください: +Wineをビルドするには以下のコマンドを実行してください: ./configure make @@ -101,6 +96,9 @@ make コンパイル設定オプションを見るには、./configure --helpを行なってください。 +更なる情報はhttps://wiki.winehq.org/Building_Wineを参照してください。 + + 5. 設定いったんWineが正しくビルドされると、"make install"を行なえます。

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 37abc5cc893a2c2e15bf0f81186d73a4167a5fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37abc5cc893a2c2e15bf0f811… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 18:08:18 2017 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ru | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index 616737e..d103ede 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -71,17 +71,11 @@ Mac OS X: Вам также понадобятся flex версии 2.5.33 или более новой и bison. -Поддержка дополнительных библиотек: +Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. - - На 64-битных платформах вы должны убедиться, что у вас установлены 32-битные - версии этих библиотек при компилировании Wine в 32-битном режиме (является - режимом по умолчанию). За более подробной информацией обратитесь к - http://wiki.winehq.org/WineOn64bit. Если вам нужен чисто 64-битный - Wine (или смешанный 32/64-битный вариант), ознакомьтесь с - http://wiki.winehq.org/Wine64. + http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ

1 0

Nikolay Sivov : dwrite: Consider inline objects overhang metrics for overall layout overhang metrics.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 3fbc00b593b242902d027147563cf88eb1f23fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbc00b593b242902d0271475… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 07:50:58 2017 +0300 dwrite: Consider inline objects overhang metrics for overall layout overhang metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 36 +++++++++++++- dlls/dwrite/tests/layout.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7975651..eda90ec 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3673,10 +3673,37 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout d2d_rect_offset(bbox, run->origin.x + run->align_dx, run->origin.y); } +static void layout_get_inlineobj_bbox(struct dwrite_textlayout *layout, struct layout_effective_inline *run, + D2D1_RECT_F *bbox) +{ + DWRITE_OVERHANG_METRICS overhang_metrics = { 0 }; + DWRITE_INLINE_OBJECT_METRICS metrics = { 0 }; + HRESULT hr; + + if (FAILED(hr = IDWriteInlineObject_GetMetrics(run->object, &metrics))) { + WARN("Failed to get inline object metrics, hr %#x.\n", hr); + memset(bbox, 0, sizeof(*bbox)); + return; + } + + bbox->left = run->origin.x + run->align_dx; + bbox->right = bbox->left + metrics.width; + bbox->top = run->origin.y; + bbox->bottom = bbox->top + metrics.height; + + IDWriteInlineObject_GetOverhangMetrics(run->object, &overhang_metrics); + + bbox->left -= overhang_metrics.left; + bbox->right += overhang_metrics.right; + bbox->top -= overhang_metrics.top; + bbox->bottom += overhang_metrics.bottom; +} + static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, DWRITE_OVERHANG_METRICS *overhangs) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + struct layout_effective_inline *inline_run; struct layout_effective_run *run; D2D1_RECT_F bbox = { 0 }; HRESULT hr; @@ -3701,9 +3728,14 @@ static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *if d2d_rect_union(&bbox, &run_bbox); } - /* FIXME: iterate over inline objects too */ + LIST_FOR_EACH_ENTRY(inline_run, &This->inlineobjects, struct layout_effective_inline, entry) { + D2D1_RECT_F object_bbox; + + layout_get_inlineobj_bbox(This, inline_run, &object_bbox); + d2d_rect_union(&bbox, &object_bbox); + } - /* deltas from text content metrics */ + /* Deltas from layout box. */ This->overhangs.left = -bbox.left; This->overhangs.top = -bbox.top; This->overhangs.right = bbox.right - This->metrics.layoutWidth; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3b0bf98..d689771 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -782,6 +782,51 @@ static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj3 = { &testinlineobjvtbl2 }; +struct test_inline_obj +{ + IDWriteInlineObject IDWriteInlineObject_iface; + DWRITE_INLINE_OBJECT_METRICS metrics; + DWRITE_OVERHANG_METRICS overhangs; +}; + +static inline struct test_inline_obj *impl_from_IDWriteInlineObject(IDWriteInlineObject *iface) +{ + return CONTAINING_RECORD(iface, struct test_inline_obj, IDWriteInlineObject_iface); +} + +static HRESULT WINAPI testinlineobj3_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *metrics) +{ + struct test_inline_obj *obj = impl_from_IDWriteInlineObject(iface); + *metrics = obj->metrics; + return S_OK; +} + +static HRESULT WINAPI testinlineobj3_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) +{ + struct test_inline_obj *obj = impl_from_IDWriteInlineObject(iface); + *overhangs = obj->overhangs; + /* Return value is ignored. */ + return E_NOTIMPL; +} + +static const IDWriteInlineObjectVtbl testinlineobjvtbl3 = { + testinlineobj_QI, + testinlineobj_AddRef, + testinlineobj_Release, + testinlineobj_Draw, + testinlineobj3_GetMetrics, + testinlineobj3_GetOverhangMetrics, + testinlineobj_GetBreakConditions, +}; + +static void test_inline_obj_init(struct test_inline_obj *obj, const DWRITE_INLINE_OBJECT_METRICS *metrics, + const DWRITE_OVERHANG_METRICS *overhangs) +{ + obj->IDWriteInlineObject_iface.lpVtbl = &testinlineobjvtbl3; + obj->metrics = *metrics; + obj->overhangs = *overhangs; +} + struct test_effect { IUnknown IUnknown_iface; @@ -5398,6 +5443,77 @@ static void test_line_spacing(void) IDWriteFactory_Release(factory); } +static void test_GetOverhangMetrics(void) +{ + static const struct overhangs_test + { + FLOAT uniform_baseline; + DWRITE_INLINE_OBJECT_METRICS metrics; + DWRITE_OVERHANG_METRICS overhang_metrics; + DWRITE_OVERHANG_METRICS expected; + } overhangs_tests[] = { + { 16.0f, { 10.0f, 50.0f, 20.0f }, { 1.0f, 2.0f, 3.0f, 4.0f }, { 1.0f, 6.0f, 3.0f, 0.0f } }, + { 15.0f, { 10.0f, 50.0f, 20.0f }, { 1.0f, 2.0f, 3.0f, 4.0f }, { 1.0f, 7.0f, 3.0f, -1.0f } }, + { 16.0f, { 10.0f, 50.0f, 20.0f }, { -1.0f, 0.0f, -3.0f, 4.0f }, { -1.0f, 4.0f, -3.0f, 0.0f } }, + { 15.0f, { 10.0f, 50.0f, 20.0f }, { -1.0f, 10.0f, 3.0f, -4.0f }, { -1.0f, 15.0f, 3.0f, -9.0f } }, + }; + static const WCHAR strW[] = {'A',0}; + IDWriteFactory *factory; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + UINT32 i; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 100.0f, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + for (i = 0; i < sizeof(overhangs_tests)/sizeof(overhangs_tests[0]); i++) { + const struct overhangs_test *test = &overhangs_tests[i]; + DWRITE_OVERHANG_METRICS overhang_metrics; + DWRITE_TEXT_RANGE range = { 0, 1 }; + DWRITE_TEXT_METRICS metrics; + struct test_inline_obj obj; + + test_inline_obj_init(&obj, &test->metrics, &test->overhang_metrics); + + hr = IDWriteTextLayout_SetLineSpacing(layout, DWRITE_LINE_SPACING_METHOD_UNIFORM, test->metrics.height * 2.0f, + test->uniform_baseline); + ok(hr == S_OK, "Failed to set line spacing, hr %#x.\n", hr); + + hr = IDWriteTextLayout_SetInlineObject(layout, NULL, range); + ok(hr == S_OK, "Failed to reset inline object, hr %#x.\n", hr); + + hr = IDWriteTextLayout_SetInlineObject(layout, &obj.IDWriteInlineObject_iface, range); + ok(hr == S_OK, "Failed to set inline object, hr %#x.\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); + + ok(metrics.width == test->metrics.width, "%u: unexpected formatted width.\n", i); + ok(metrics.height == test->metrics.height * 2.0f, "%u: unexpected formatted height.\n", i); + + hr = IDWriteTextLayout_SetMaxWidth(layout, metrics.width); + hr = IDWriteTextLayout_SetMaxHeight(layout, test->metrics.height); + + hr = IDWriteTextLayout_GetOverhangMetrics(layout, &overhang_metrics); + ok(hr == S_OK, "Failed to get overhang metrics, hr %#x.\n", hr); + + ok(!memcmp(&overhang_metrics, &test->expected, sizeof(overhang_metrics)), + "%u: unexpected overhang metrics (%f, %f, %f, %f).\n", i, overhang_metrics.left, overhang_metrics.top, + overhang_metrics.right, overhang_metrics.bottom); + } + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5447,6 +5563,7 @@ START_TEST(layout) test_SetUnderline(); test_InvalidateLayout(); test_line_spacing(); + test_GetOverhangMetrics(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : dwrite: Properly free mappings in fontfallbackbuilder_Release.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 850b67f28f60097322f183b2727d1ada7c15f563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850b67f28f60097322f183b27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 29 20:37:02 2017 +0200 dwrite: Properly free mappings in fontfallbackbuilder_Release. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 4424110..ed66929 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2305,10 +2305,10 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac IDWriteFontCollection_Release(mapping->collection); heap_free(mapping->ranges); heap_free(mapping->locale); - heap_free(mapping); } IDWriteFactory5_Release(fallbackbuilder->factory); + heap_free(fallbackbuilder->mappings); heap_free(fallbackbuilder); }

1 0

Fabian Maurer : dxva2api.idl: Don't redefine REFERENCE_TIME if it' s already defined.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 84d2d7818bc84ea90303d8b047f3e4e833e6e316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d2d7818bc84ea90303d8b04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Oct 1 21:10:16 2017 +0200 dxva2api.idl: Don't redefine REFERENCE_TIME if it's already defined. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 8739b82..8dd1d96 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -86,7 +86,10 @@ cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D") /* Encryption */ cpp_quote("DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("#ifndef REFERENCE_TIME_DEFINED") +cpp_quote("#define REFERENCE_TIME_DEFINED") typedef LONGLONG REFERENCE_TIME; +cpp_quote("#endif") enum {

1 0

Michael Stefaniuc : fonts: Use a standard Em size for the other fonts too.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: ecc050b3029e1fceb3784573c751ce265031acea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc050b3029e1fceb3784573c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Sep 29 22:27:32 2017 +0200 fonts: Use a standard Em size for the other fonts too. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/fixedsys_jp.sfd | 515 ++++++++++---------- fonts/fixedsys_jp.ttf | Bin 8716 -> 8724 bytes fonts/system.sfd | 1265 +++++++++++++++++++++++++------------------------ fonts/system.ttf | Bin 28712 -> 28912 bytes 4 files changed, 891 insertions(+), 889 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc050b3029e1fceb3784…

1 0