May 2016 - Wine-commits - list.winehq.org

Julian Rüger : German translation for release 1.9.8
by Jeremy Newman 10 May '16

10 May '16

Module: website Branch: master Commit: 086d54aa1ca1480e9fa07035749650801f349d7b URL: http://source.winehq.org/git/website.git/?a=commit;h=086d54aa1ca1480e9fa070… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 16:52:01 2016 +0200 German translation for release 1.9.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016041601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2016041601.xml b/news/de/2016041601.xml new file mode 100644 index 0000000..3143347 --- /dev/null +++ b/news/de/2016041601.xml @@ -0,0 +1,18 @@ +<news> +<date>16. April 2016</date> +<title>Wine 1.9.8 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.8 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.8">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Fortschritte in Richtung des WineD3D-Commandstream.</li> + <li>Fehlerkorrekturen an der Mono-Engine.</li> + <li>Bessere Unterstützung für WebServices-Reader.</li> + <li>Weitere Shader-Model-5-Unterstützung.</li> + <li>Unterstützung von Gradienten in Metafiles.</li> + <li>Verbesserte Tabellenformatierung in WinHelp.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.8.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.9
by Jeremy Newman 10 May '16

10 May '16

Module: website Branch: master Commit: b63a3e3e15a406dee4e3a6dd31303b65c1ad4963 URL: http://source.winehq.org/git/website.git/?a=commit;h=b63a3e3e15a406dee4e3a6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 16:55:17 2016 +0200 German translation for release 1.9.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016043001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016043001.xml b/news/de/2016043001.xml new file mode 100644 index 0000000..6d90351 --- /dev/null +++ b/news/de/2016043001.xml @@ -0,0 +1,16 @@ +<news> +<date>30. April 2016</date> +<title>Wine 1.9.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Fortschritte in Richtung des WineD3D-Commandstream.</li> + <li>Service-Proxies in WebServices.</li> + <li>Query-Unterstützung des mitgelieferten reg.exe-Werkzeugs.</li> + <li>Verbesserte Unterstützung langer URLs in WinInet.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.9.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 6eca85092974eec1ca9d59707ad45e3bd27f2b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eca85092974eec1ca9d59707… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed May 4 22:59:49 2016 +0200 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 1017 ++++++++++++++++++++++++++--------------------------------- 1 file changed, 451 insertions(+), 566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eca85092974eec1ca9d5…

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 91733274a4bebbe388740fbcc81a1f62b3e25a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91733274a4bebbe388740fbcc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 5 21:46:28 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/uk.po b/po/uk.po index 603c79a..4fa1f79 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-20 20:39+0200\n" +"PO-Revision-Date: 2016-05-05 21:44+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -2918,7 +2918,7 @@ msgstr "Ви можете захистити паролем приватний #: cryptui.rc:174 msgid "The passwords do not match." -msgstr "Паролі не співпадають." +msgstr "Паролі не збігаються." #: cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." @@ -11735,7 +11735,7 @@ msgstr "" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Пошук завершено. Знайдено збігів: %1!d!\n" #: regedit.rc:34 msgid "&Registry" @@ -13179,8 +13179,6 @@ msgstr "" "цих вкладках як для окремої програми, так і глобально." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." msgstr "&Додати програму..." @@ -13307,7 +13305,7 @@ msgstr "&Шлях:" #: winecfg.rc:248 winecfg.rc:38 msgid "Show Advan&ced" -msgstr "Показати &додат. налаштування" +msgstr "Показати &додат. налашт." #: winecfg.rc:249 msgid "De&vice:" @@ -13407,7 +13405,7 @@ msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 msgid "Hide Advan&ced" -msgstr "Сховати &додат. налаштування" +msgstr "Сховати &додат. налашт." #: winecfg.rc:39 msgid "(No Theme)"

1 0

Ken Thomases : winemac: Add support for a high-resolution ("Retina") rendering mode.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 1c94bf396f6ed41bf999ab1db36e645b9ad035e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c94bf396f6ed41bf999ab1db… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 5 13:53:36 2016 -0500 winemac: Add support for a high-resolution ("Retina") rendering mode. When this Retina mode is enabled and the primary display is in the user's default configuration, Wine gets told that screen and window sizes and mouse coordinates are twice what Cocoa reports them as in its virtual coordinate system ("points"). The Windows apps then renders at that high resolution and the Mac driver blits it to screen. If the screen is actually a Retina display in a high-DPI mode, then this extra detail will be preserved. Otherwise, the rendering will be downsampled and blurry. This is intended to be combined with increasing the Windows DPI, as via winecfg. If that is doubled to 192, then, in theory, graphical elements will remain the same visual size on screen but be rendered with finer detail. Unfortunately, many Windows programs don't correctly handle non-standard DPI so the results are not always perfect. The registry setting to enable Retina mode is: [HKEY_CURRENT_USER\Software\Wine\Mac Driver] "RetinaMode"="y" Note that this setting is not looked for in the AppDefaults\<exe name> key because it doesn't make sense for only some processes in a Wine session to see the high-resolution sizes and coordinates. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 52 +++++++++-- dlls/winemac.drv/cocoa_display.m | 2 + dlls/winemac.drv/cocoa_event.m | 2 + dlls/winemac.drv/cocoa_opengl.h | 2 + dlls/winemac.drv/cocoa_opengl.m | 109 +++++++++++++++++++--- dlls/winemac.drv/cocoa_window.h | 6 ++ dlls/winemac.drv/cocoa_window.m | 193 +++++++++++++++++++++++++++++++++------ dlls/winemac.drv/display.c | 66 ++++++++++++- dlls/winemac.drv/gdi.c | 61 ++++++++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 77 +++++++++++++++- dlls/winemac.drv/macdrv_main.c | 6 ++ dlls/winemac.drv/opengl.c | 82 ++++++++++++++++- dlls/winemac.drv/surface.c | 2 +- 14 files changed, 587 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c94bf396f6ed41bf999a…

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontList1::GetFont().
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 51154acb6a5ad95e0b9610fb8e3069393ff17a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51154acb6a5ad95e0b9610fb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 00:34:01 2016 +0300 dwrite: Implement IDWriteFontList1::GetFont(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2aad837..9c874f2 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1678,9 +1678,17 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList1 *iface, UINT32 in { struct dwrite_fontlist *This = impl_from_IDWriteFontList1(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, font); + TRACE("(%p)->(%u %p)\n", This, index, font); - return E_NOTIMPL; + *font = NULL; + + if (This->font_count == 0) + return S_FALSE; + + if (index >= This->font_count) + return E_FAIL; + + return create_font(This->fonts[index], This->family, font); } static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5169f2a..3ffe97f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2945,10 +2945,18 @@ static void test_GetMatchingFonts(void) font = (void*)0xdeadbeef; hr = IDWriteFontList1_GetFont(fontlist1, ~0u, &font); - todo_wine { ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(font == NULL, "got %p\n", font); - } + + font = (void*)0xdeadbeef; + hr = IDWriteFontList1_GetFont(fontlist1, IDWriteFontList1_GetFontCount(fontlist1), &font); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(font == NULL, "got %p\n", font); + + hr = IDWriteFontList1_GetFont(fontlist1, 0, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont3_Release(font); + IDWriteFontList1_Release(fontlist1); } else

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontList1::GetFontFaceReference() .
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: e82cf8aa709819f1e2e1ed07ad143d3c687c1d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82cf8aa709819f1e2e1ed07a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 00:34:02 2016 +0300 dwrite: Implement IDWriteFontList1::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 +++++++++++++-- dlls/dwrite/tests/font.c | 16 +++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9c874f2..bf79412 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1695,10 +1695,21 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList1 *ifa IDWriteFontFaceReference **reference) { struct dwrite_fontlist *This = impl_from_IDWriteFontList1(iface); + IDWriteFont3 *font; + HRESULT hr; - FIXME("(%p)->(%u %p): stub\n", This, index, reference); + TRACE("(%p)->(%u %p)\n", This, index, reference); - return E_NOTIMPL; + *reference = NULL; + + hr = IDWriteFontList1_GetFont(iface, index, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont3_GetFontFaceReference(font, reference); + IDWriteFont3_Release(font); + + return hr; } static const IDWriteFontList1Vtbl dwritefontlistvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3ffe97f..baef637 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2941,7 +2941,12 @@ static void test_GetMatchingFonts(void) hr = IDWriteFontList_QueryInterface(fontlist, &IID_IDWriteFontList1, (void**)&fontlist1); if (hr == S_OK) { + IDWriteFontFaceReference *ref, *ref1; IDWriteFont3 *font; + UINT32 count; + + count = IDWriteFontList1_GetFontCount(fontlist1); + ok(count > 0, "got %u\n", count); font = (void*)0xdeadbeef; hr = IDWriteFontList1_GetFont(fontlist1, ~0u, &font); @@ -2949,7 +2954,7 @@ static void test_GetMatchingFonts(void) ok(font == NULL, "got %p\n", font); font = (void*)0xdeadbeef; - hr = IDWriteFontList1_GetFont(fontlist1, IDWriteFontList1_GetFontCount(fontlist1), &font); + hr = IDWriteFontList1_GetFont(fontlist1, count, &font); ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(font == NULL, "got %p\n", font); @@ -2957,6 +2962,15 @@ static void test_GetMatchingFonts(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFont3_Release(font); + hr = IDWriteFontList1_GetFontFaceReference(fontlist1, 0, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontList1_GetFontFaceReference(fontlist1, 0, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref != ref1, "got %p, %p\n", ref, ref1); + + IDWriteFontFaceReference_Release(ref1); + IDWriteFontFaceReference_Release(ref); IDWriteFontList1_Release(fontlist1); } else

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontFamily1::GetFontFaceReference ().
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: c5259f72e3a385e95f26dc1ad9ddcc5fd6a21408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5259f72e3a385e95f26dc1ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 00:34:03 2016 +0300 dwrite: Implement IDWriteFontFamily1::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 17 ++++++++++++++--- dlls/dwrite/tests/font.c | 12 ++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bf79412..e68da0d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1994,13 +1994,24 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily1 *iface, UINT3 } static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily1 *iface, UINT32 index, - IDWriteFontFaceReference **ref) + IDWriteFontFaceReference **reference) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); + IDWriteFont3 *font; + HRESULT hr; - FIXME("(%p)->(%u %p): stub\n", This, index, ref); + TRACE("(%p)->(%u %p)\n", This, index, reference); - return E_NOTIMPL; + *reference = NULL; + + hr = IDWriteFontFamily1_GetFont(iface, index, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont3_GetFontFaceReference(font, reference); + IDWriteFont3_Release(font); + + return hr; } static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index baef637..aa57d81 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1265,6 +1265,7 @@ if (0) /* crashes on native */ hr = IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily1, (void**)&family1); if (hr == S_OK) { + IDWriteFontFaceReference *ref, *ref1; IDWriteFontList *fontlist; IDWriteFont3 *font3; IDWriteFont1 *font1; @@ -1293,6 +1294,17 @@ if (0) /* crashes on native */ IDWriteFontList_Release(fontlist); IDWriteFont3_Release(font3); + + hr = IDWriteFontFamily1_GetFontFaceReference(family1, 0, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily1_GetFontFaceReference(family1, 0, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref != ref1, "got %p, %p\n", ref, ref1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + IDWriteFontFamily1_Release(family1); } else

1 0

Nikolay Sivov : include: Added IDWriteFontSet definition.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 9fc89163d8c9d227277b57dd5078c948e8281d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc89163d8c9d227277b57dd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 00:34:04 2016 +0300 include: Added IDWriteFontSet definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 74 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 85c20fe..0d1dc40 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -48,6 +48,30 @@ typedef enum DWRITE_RENDERING_MODE1 DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED } DWRITE_RENDERING_MODE1; +typedef enum DWRITE_FONT_PROPERTY_ID +{ + DWRITE_FONT_PROPERTY_ID_NONE, + DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_FULL_NAME, + DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, + DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG, + DWRITE_FONT_PROPERTY_ID_WEIGHT, + DWRITE_FONT_PROPERTY_ID_STRETCH, + DWRITE_FONT_PROPERTY_ID_STYLE, + DWRITE_FONT_PROPERTY_ID_TOTAL +} DWRITE_FONT_PROPERTY_ID; + +typedef struct DWRITE_FONT_PROPERTY +{ + DWRITE_FONT_PROPERTY_ID propertyId; + WCHAR const *propertyValue; + WCHAR const *localeName; +} DWRITE_FONT_PROPERTY; + [ local, object, @@ -86,6 +110,43 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, + uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) +] +interface IDWriteStringList : IUnknown +{ + UINT32 GetCount(); + HRESULT GetLocaleNameLength(UINT32 index, UINT32 *length); + HRESULT GetLocaleName(UINT32 index, WCHAR *name, UINT32 size); + HRESULT GetStringLength(UINT32 index, UINT32 *length); + HRESULT GetString(UINT32 index, WCHAR *string, UINT32 size); +} + +[ + local, + object, + uuid(53585141-d9f8-4095-8321-d73cf6bd116b) +] +interface IDWriteFontSet : IUnknown +{ + UINT32 GetFontCount(); + HRESULT GetFontFaceReference(UINT32 index, IDWriteFontFaceReference **reference); + HRESULT FindFontFaceReference(IDWriteFontFaceReference *reference, + UINT32 *index, BOOL *exists); + HRESULT FindFontFace(IDWriteFontFace *fontface, UINT32 *index, BOOL *exists); + HRESULT GetPropertyValues__(DWRITE_FONT_PROPERTY_ID id, IDWriteStringList **values); + HRESULT GetPropertyValues_(DWRITE_FONT_PROPERTY_ID id, + WCHAR const *preferred_locales, IDWriteStringList **values); + HRESULT GetPropertyValues(UINT32 index, DWRITE_FONT_PROPERTY_ID id, BOOL *exists, + IDWriteLocalizedStrings **values); + HRESULT GetPropertyOccurenceCount(DWRITE_FONT_PROPERTY const *property, UINT32 *count); + HRESULT GetMatchingFonts_(WCHAR const *family, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, + DWRITE_FONT_STYLE style, IDWriteFontSet **fontset); + HRESULT GetMatchingFonts(DWRITE_FONT_PROPERTY const *props, UINT32 count, IDWriteFontSet **fontset); +} + +[ + local, + object, uuid(29748ed6-8c9c-4a6a-be0b-d912e8538944) ] interface IDWriteFont3 : IDWriteFont2 @@ -193,19 +254,6 @@ interface IDWriteFontFace3 : IDWriteFontFace2 BOOL enqueue_if_not, BOOL *are_local); } -[ - local, - object, - uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) -] -interface IDWriteStringList : IUnknown -{ - UINT32 GetCount(); - HRESULT GetLocaleNameLength(UINT32 index, UINT32 *length); - HRESULT GetLocaleName(UINT32 index, WCHAR *name, UINT32 size); - HRESULT GetStringLength(UINT32 index, UINT32 *length); - HRESULT GetString(UINT32 index, WCHAR *string, UINT32 size); -} typedef struct DWRITE_LINE_METRICS1 {

1 0

Alexandre Julliard : makefiles: Fix symlink rules when ln -s isn' t supported.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: 64124815f759c0cc4fb906e933bce4ae8707eeaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=64124815f759c0cc4fb906e93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 13:54:13 2016 +0900 makefiles: Fix symlink rules when ln -s isn't supported. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6d0c0fc..add722f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2124,6 +2124,32 @@ static struct strarray get_shared_lib_names( const char *libname ) /******************************************************************* + * output_symlink_rule + * + * Output a rule to create a symlink. + */ +static void output_symlink_rule( const char *src_name, const char *link_name ) +{ + const char *name; + + output( "\trm -f %s && ", link_name ); + + /* dest path with a directory needs special handling if ln -s isn't supported */ + if (strcmp( ln_s, "ln -s" ) && ((name = strrchr( link_name, '/' )))) + { + char *dir = xstrdup( link_name ); + dir[name - link_name] = 0; + output( "cd %s && %s %s %s\n", *dir ? dir : "/", ln_s, src_name, name + 1 ); + free( dir ); + } + else + { + output( "%s %s %s\n", ln_s, src_name, link_name ); + } +} + + +/******************************************************************* * output_install_rules * * Rules are stored as a (file,dest) pair of values. @@ -2192,7 +2218,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct install_sh, tools_dir_path( make, file ), dest ); break; case 'y': /* symlink */ - output( "\trm -f %s && %s %s %s\n", dest, ln_s, file, dest ); + output_symlink_rule( file, dest ); break; default: assert(0); @@ -2213,7 +2239,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *dir, *lib; + const char *lib, *dst; if (!make->module) return ret; if (!make->importlib) return ret; @@ -2225,18 +2251,19 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, !strcmp( make->module + strlen( make->importlib ), ".dll" )) return ret; - dir = obj_dir_path( parent, "dlls" ); lib = strmake( "lib%s.%s", make->importlib, *dll_ext ? "def" : "a" ); - output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); - strarray_add( &ret, strmake( "%s/%s", dir, lib )); + dst = concat_paths( obj_dir_path( parent, "dlls" ), lib ); + output( "%s: %s\n", dst, base_dir_path( make, lib )); + output_symlink_rule( concat_paths( make->base_dir + strlen("dlls/"), lib ), dst ); + strarray_add( &ret, dst ); if (crosstarget && !make->is_win16) { lib = strmake( "lib%s.cross.a", make->importlib ); - output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); - strarray_add( &ret, strmake( "%s/%s", dir, lib )); + dst = concat_paths( obj_dir_path( parent, "dlls" ), lib ); + output( "%s: %s\n", dst, base_dir_path( make, lib )); + output_symlink_rule( concat_paths( make->base_dir + strlen("dlls/"), lib ), dst ); + strarray_add( &ret, dst ); } return ret; } @@ -2881,7 +2908,7 @@ static struct strarray output_sources( const struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output( "\trm -f $@ && %s %s $@\n", ln_s, names.str[i-1] ); + output_symlink_rule( obj_dir_path( make, names.str[i-1] ), obj_dir_path( make, names.str[i] )); add_install_rule( make, install_rules, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -3049,13 +3076,12 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); strarray_add( &all_targets, program ); - if (symlinks.count) + for (j = 0; j < symlinks.count; j++) { - output_filenames_obj_dir( make, symlinks ); - output( ": %s\n", obj_dir_path( make, program )); - output( "\trm -f $@ && %s %s $@\n", ln_s, obj_dir_path( make, program )); - strarray_addall( &all_targets, symlinks ); + output( "%s: %s\n", obj_dir_path( make, symlinks.str[j] ), obj_dir_path( make, program )); + output_symlink_rule( obj_dir_path( make, program ), obj_dir_path( make, symlinks.str[j] )); } + strarray_addall( &all_targets, symlinks ); add_install_rule( make, install_rules, program, program_installed ? program_installed : program, strmake( "p$(bindir)/%s", program ));

1 0