October 2012 - Wine-Commits

Dmitry Timoshkov : gdiplus: Stop adding 1/ 6 of EM height to the created font height.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 1c30b894ec3389551699c4ad88faf527be4ba01c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c30b894ec3389551699c4ad8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:52:10 2012 +0900 gdiplus: Stop adding 1/6 of EM height to the created font height. --- dlls/gdiplus/graphics.c | 8 +++----- dlls/gdiplus/tests/graphics.c | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7e16460..d975d3c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2138,15 +2138,13 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; - REAL angle, rel_width, rel_height, font_height, font_to_pixel_scale; + REAL angle, rel_width, rel_height, font_height; LOGFONTW lfw; HFONT unscaled_font; TEXTMETRICW textmet; - font_to_pixel_scale = (format && format->generic_typographic) ? 1.0 : units_scale(UnitPoint, UnitPixel, font->family->dpi); - if (font->unit == UnitPixel) - font_height = font->emSize * font_to_pixel_scale; + font_height = font->emSize; else { REAL unit_scale, res; @@ -2154,7 +2152,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, res = (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) ? graphics->xres : graphics->yres; unit_scale = units_scale(font->unit, graphics->unit, res); - font_height = font->emSize * font_to_pixel_scale * unit_scale; + font_height = font->emSize * unit_scale; if (graphics->unit != UnitDisplay) font_height /= graphics->scale; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5219823..5ee5002 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3530,6 +3530,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3546,6 +3547,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3613,6 +3615,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3629,6 +3632,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3640,6 +3644,7 @@ static void test_GdipMeasureString(void) height *= td[i].page_scale; /*trace("%u: unit %u, %.1fx%.1f dpi, scale %.1f, height %f, pixels %f\n", i, td[i].unit, td[i].res_x, td[i].res_y, td[i].page_scale, bounds.Height, height);*/ +todo_wine expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); @@ -3833,12 +3838,14 @@ static void test_font_height_scaling(void) status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; +todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); ptf.Y /= 100.0; match = fabs(100.0 - ptf.Y) <= 1.0; +todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -3874,6 +3881,7 @@ static void test_font_height_scaling(void) match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); match = fabs(1.0 - height / rect.Height) <= 0.1; +todo_wine ok(match, "Expected %f, got %f\n", height, rect.Height); match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0);

1 0

Dmitry Timoshkov : gdiplus: Workaround missing support for true floating point regions in Wine gdiplus by using a scaling world transform .
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: ec4cd117b5eec2f544210e9ea7ead72354518ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4cd117b5eec2f544210e9ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:51:20 2012 +0900 gdiplus: Workaround missing support for true floating point regions in Wine gdiplus by using a scaling world transform. This simplifies the test and makes sure that there is no broken workarounds in the tests. --- dlls/gdiplus/tests/graphics.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1b0bff0..5219823 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3729,7 +3729,7 @@ static void test_font_height_scaling(void) PointF ptf; GpUnit gfx_unit, font_unit; - status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); expect(Ok, status); @@ -3790,6 +3790,9 @@ static void test_font_height_scaling(void) return; } + status = GdipScaleWorldTransform(graphics, 0.01, 0.01, MatrixOrderAppend); + expect(Ok, status); + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ /* UnitPixel as a font base unit is not tested because it drastically differs in behaviour */ @@ -3834,7 +3837,8 @@ static void test_font_height_scaling(void) /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); - match = fabs(100.0 - ptf.Y) <= 1.1; + ptf.Y /= 100.0; + match = fabs(100.0 - ptf.Y) <= 1.0; ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -3857,38 +3861,22 @@ static void test_font_height_scaling(void) expect(Ok, status); set_rect_empty(&rect); - rect.Width = 32000.0; - rect.Height = 32000.0; + rect.Width = 320000.0; + rect.Height = 320000.0; status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); expect(Ok, status); set_rect_empty(&rect); status = GdipGetRegionBounds(region, graphics, &rect); expect(Ok, status); /*trace("region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height);*/ - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (margin < 1.0) - todo_wine ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); - else ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); expectf(0.0, rect.Y); - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (margin < 1.0) - { - match = fabs(margin - rect.X) < 0.25; + match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); - } - else - { - match = fabs(margin - rect.X) <= 0.5; - ok(match, "Expected %f, got %f\n", margin, rect.X); - } - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (height < 1.0) - expectf_(height, rect.Height, height / 15.0); - else -todo_wine - expectf_(height, rect.Height, height / 15.0); - expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); + match = fabs(1.0 - height / rect.Height) <= 0.1; + ok(match, "Expected %f, got %f\n", height, rect.Height); + match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; + ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0); } GdipDeleteFont(font);

1 0

Dmitry Timoshkov : gdiplus: Detect broken GdipMeasureCharacterRanges behaviour before performing the font height scaling test .
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 2551ce4ea765b949a3db53138003fe62a8e627e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ce4ea765b949a3db53138… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:50:28 2012 +0900 gdiplus: Detect broken GdipMeasureCharacterRanges behaviour before performing the font height scaling test. --- dlls/gdiplus/tests/graphics.c | 61 +++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 13b89be..1b0bff0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3725,7 +3725,7 @@ static void test_font_height_scaling(void) GpFont *font; GpStatus status; RectF bounds, rect; - REAL height, dpi; + REAL height, dpi, scale; PointF ptf; GpUnit gfx_unit, font_unit; @@ -3745,6 +3745,51 @@ static void test_font_height_scaling(void) status = GdipGetDpiY(graphics, &dpi); expect(Ok, status); + /* First check if tested functionality works: + * under XP if font and graphics units differ then GdipTransformPoints + * followed by GdipSetPageUnit to change the graphics units breaks region + * scaling in GdipMeasureCharacterRanges called later. + */ + status = GdipSetPageUnit(graphics, UnitDocument); + expect(Ok, status); + + ptf.X = 0.0; + ptf.Y = 0.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, status); + + status = GdipCreateFont(family, 720.0, FontStyleRegular, UnitPoint, &font); + expect(Ok, status); + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + trace("test bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + + set_rect_empty(&rect); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); + trace("test region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height); + + GdipDeleteFont(font); + + scale = rect.Height / bounds.Height; + if (fabs(scale - 1.0) > 0.1) + { + win_skip("GdipGetRegionBounds is broken, scale %f (should be near 1.0)\n", scale); + return; + } + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ /* UnitPixel as a font base unit is not tested because it drastically differs in behaviour */ @@ -3785,12 +3830,12 @@ static void test_font_height_scaling(void) status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; - ok(match || broken(!match) /* before win7 */, "Expected 100.0, got %f\n", ptf.Y); + ok(match, "Expected 100.0, got %f\n", ptf.Y); /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); match = fabs(100.0 - ptf.Y) <= 1.1; - ok(match || broken(!match) /* before win7 */, "Expected 100.0, got %f\n", ptf.Y); + ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); @@ -3826,22 +3871,16 @@ static void test_font_height_scaling(void) else ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); expectf(0.0, rect.Y); - /* before Win7 GdipMeasureCharacterRanges behaviour is completely broken */ /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ if (margin < 1.0) { match = fabs(margin - rect.X) < 0.25; - ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); + ok(match, "Expected %f, got %f\n", margin, rect.X); } else { match = fabs(margin - rect.X) <= 0.5; - ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); - } - if (!match) - { - win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); - continue; + ok(match, "Expected %f, got %f\n", margin, rect.X); } /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ if (height < 1.0)

1 0

Alexandre Julliard : winedbg: Mark the lexer as always interactive to prevent some shortcuts.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 8bf223a86dee7fe120e0ddd2460309a2198a0125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf223a86dee7fe120e0ddd24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 12:33:52 2012 +0200 winedbg: Mark the lexer as always interactive to prevent some shortcuts. --- programs/winedbg/debug.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index ab1f865..a6ab10c 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option noinput nounput never-interactive 8bit prefix="dbg_" +%option noinput nounput always-interactive 8bit prefix="dbg_" %{ #include "config.h"

1 0

Łukasz Wojniłowicz : po: Update Polish translations.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: a1a6ce6398829daa65a68ab2808b7a315444977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a6ce6398829daa65a68ab28… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 5 17:51:29 2012 +0200 po: Update Polish translations. --- po/pl.po | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 14 deletions(-) diff --git a/po/pl.po b/po/pl.po index d1d3986..814b8a0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-14 15:46+0200\n" +"PO-Revision-Date: 2012-10-05 17:26+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -3471,6 +3471,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Po wyłączeniu lub włączeniu urządzenia, podłączone joysticki nie będą tutaj " +"uaktualnione do momentu ponownego uruchomienia tego apletu." #: joy.rc:47 msgid "Test Joystick" @@ -3485,16 +3487,16 @@ msgid "Test Force Feedback" msgstr "Testuj odczucie siły zwrotnej" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Dostępne formaty" +msgstr "Dostępne efekty" #: joy.rc:66 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Naciśnij jakikolwiek klawisz na kontrolerze, aby aktywować wybrany efekt. " +"Kierunek efektu może być zmieniony przy użyciu osi kontrolera." #: joy.rc:28 msgid "Game Controllers" @@ -9718,6 +9720,33 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Uruchom program lub otwórz dokument w programie normalnie używanym do plików " +"z tym przyrostkiem.\n" +"Użycie:\n" +"start [opcje] nazwa_programu_ze_ścieżką [...]\n" +"start [opcje] nazwa_dokumentu_ze_ścieżką\n" +"\n" +"Opcje:\n" +"\"title\" Podaje tytuł podrzędnych okien.\n" +"/d katalog Uruchamia program w podanym katalogu.\n" +"/b Nie twórz nowej konsoli dla programu.\n" +"/i Uruchom program ze świeżymi zmiennymi środowiskowymi.\n" +"/min Uruchom program zminimalizowany.\n" +"/max Uruchom program zmaksymalizowany.\n" +"/low Uruchom program w klasie priorytetowej bezczynności.\n" +"/normal Uruchom program w normalnej klasie priorytetowej.\n" +"/high Uruchom program w wysokiej klasie priorytetowej.\n" +"/realtime Uruchom program w klasie priorytetowej czasu rzeczywistego.\n" +"/abovenormal Uruchom program w klasie priorytetowej powyżej normalnej.\n" +"/belownormal Uruchom program w klasie priorytetowej poniżej normalnej.\n" +"/node n Uruchom program na podanym węźle NUMA.\n" +"/affinity maska Uruchom program ze specjalną maską afiniczności.\n" +"/wait Poczekaj, aż uruchomiony program skończy, a następnie wyjdź z " +"jego kodem wyjścia.\n" +"/unix Użyj nazwy pliku ze ścieżka z Uniksa i uruchom plik tak jak " +"windows explorer.\n" +"/ProgIDOpen Otwórz dokument używając podanego progID.\n" +"/? Wyświetl tą pomoc i wyjdź.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -13699,22 +13728,16 @@ msgid "Help topics: " msgstr "Tematy pomocy: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" +msgstr "Błąd: Wiersz poleceń jest nieobsługiwany\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Nie znaleziono zestawu właściwości.\n" +msgstr "Błąd: Nie znaleziono aliasu\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Błąd: Niewłaściwa nazwa klucza\n" +msgstr "Błąd: Nieprawidłowe zapytanie\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Dmitry Timoshkov : gdiplus: Add a font transformation test.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: e664c2bd3ac39da32d6093aa3be272a6fa7f6ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e664c2bd3ac39da32d6093aa3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:48:59 2012 +0900 gdiplus: Add a font transformation test. --- dlls/gdiplus/tests/font.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 66517b1..0ac9558 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -804,6 +804,75 @@ todo_wine DeleteDC(hdc); } +static void test_font_transform(void) +{ + GpStatus status; + HDC hdc; + LOGFONT lf; + GpFont *font; + GpGraphics *graphics; + GpMatrix *matrix; + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + memset(&lf, 0, sizeof(lf)); + lstrcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -100; + lf.lfWidth = 100; + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, status); + + /* identity matrix */ + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + expect(-100, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale matrix */ + status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(-300, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale + ratate matrix */ + status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(-300, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale + ratate + shear matrix */ + status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(1032, lf.lfHeight); + expect(0, lf.lfWidth); + + GdipDeleteMatrix(matrix); + GdipDeleteFont(font); + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -816,6 +885,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_font_transform(); test_font_substitution(); test_font_metrics(); test_createfont();

1 0

Piotr Caban : msvcp60: Added basic_filebuf::open implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: d534e1f3dc2322bd25dc9d14bee696ead2bea2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d534e1f3dc2322bd25dc9d14b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:54:17 2012 +0200 msvcp60: Added basic_filebuf::open implementation. --- dlls/msvcp60/ios.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index cf3620a..8d7381a 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2491,6 +2491,58 @@ FILE* __cdecl ___Fiopen(const char *name, int mode) return _Fiopen(name, mode, _SH_DENYNO); } +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBGHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ +static basic_filebuf_char* basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +{ + FILE *f = NULL; + + TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); + + if(basic_filebuf_char_is_open(this)) + return NULL; + + if(!(f = _Fiopen_wchar(name, mode, prot))) + return NULL; + + basic_filebuf_char__Init(this, f, INITFL_open); + basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(this->base.loc)); + return this; +} + +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDHH@Z */ +static basic_filebuf_char* basic_filebuf_char_open(basic_filebuf_char *this, const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%p %s %d %d)\n", this, name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return basic_filebuf_char_open_wchar(this, nameW, mode, prot); +} + +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDF@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDF@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_mode_old, 12) +basic_filebuf_char* __thiscall basic_filebuf_char_open_mode_old(basic_filebuf_char *this, const char *name, short mode) +{ + TRACE("(%p %p %d)\n", this, name, mode); + return basic_filebuf_char_open(this, name, mode, _SH_DENYNO); +} + +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_mode, 12) +basic_filebuf_char* __thiscall basic_filebuf_char_open_mode(basic_filebuf_char *this, const char *name, int mode) +{ + TRACE("(%p %p %d)\n", this, name, mode); + return basic_filebuf_char_open(this, name, mode, _SH_DENYNO); +} + /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHH(a)Z */ /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHH(a)Z */ DEFINE_THISCALL_WRAPPER(basic_filebuf_char_overflow, 8) @@ -2955,6 +3007,58 @@ MSVCP_bool __thiscall basic_filebuf_wchar_is_open(const basic_filebuf_wchar *thi return this->file != NULL; } +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PB_WHH@Z */ +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PBGHH@Z */ +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ +static basic_filebuf_wchar* basic_filebuf_wchar_open_wchar(basic_filebuf_wchar *this, const wchar_t *name, int mode, int prot) +{ + FILE *f = NULL; + + TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); + + if(basic_filebuf_wchar_is_open(this)) + return NULL; + + if(!(f = _Fiopen_wchar(name, mode, prot))) + return NULL; + + basic_filebuf_wchar__Init(this, f, INITFL_open); + basic_filebuf_wchar__Initcvt(this, codecvt_wchar_use_facet(this->base.loc)); + return this; +} + +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PBDHH@Z */ +/* ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAPEAV12(a)PEBDHH@Z */ +static basic_filebuf_wchar* basic_filebuf_wchar_open(basic_filebuf_wchar *this, const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%p %s %d %d)\n", this, name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return basic_filebuf_wchar_open_wchar(this, nameW, mode, prot); +} + +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDF@Z */ +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDF@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode_old, 12) +basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_mode_old(basic_filebuf_wchar *this, const char *name, short mode) +{ + TRACE("(%p %p %d)\n", this, name, mode); + return basic_filebuf_wchar_open(this, name, mode, _SH_DENYNO); +} + +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z */ +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode, 12) +basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_mode(basic_filebuf_wchar *this, const char *name, int mode) +{ + TRACE("(%p %p %d)\n", this, name, mode); + return basic_filebuf_wchar_open(this, name, mode, _SH_DENYNO); +} + /* ?overflow@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGG(a)Z */ /* ?overflow@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGG(a)Z */ /* ?overflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGG(a)Z */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e6bf596..9301a6f 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3498,14 +3498,14 @@ @ extern -arch=win64 ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB basic_string_char_npos @ extern -arch=win32 ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2IB basic_string_wchar_npos @ extern -arch=win64 ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2_KB basic_string_wchar_npos -@ stub -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDF@Z -@ stub -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDF@Z -@ stub -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDH@Z -@ stub -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDH@Z -@ stub -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDF@Z -@ stub -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDF@Z -@ stub -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z -@ stub -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDH@Z +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDF@Z(ptr str long) basic_filebuf_char_open_mode_old +@ cdecl -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDF@Z(ptr str long) basic_filebuf_char_open_mode_old +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_char_open_mode +@ cdecl -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDH@Z(ptr str long) basic_filebuf_char_open_mode +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDF@Z(ptr str long) basic_filebuf_wchar_open_mode_old +@ cdecl -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDF@Z(ptr str long) basic_filebuf_wchar_open_mode_old +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_wchar_open_mode +@ cdecl -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDH@Z(ptr str long) basic_filebuf_wchar_open_mode @ stub -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z @ stub -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z @ stub -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z

1 0

Piotr Caban : msvcp60: Added __Fiopen implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 66d35c4048882f5d8d63f53460908ed672d7a658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d35c4048882f5d8d63f5346… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:54:00 2012 +0200 msvcp60: Added __Fiopen implementation. --- dlls/msvcp60/ios.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 4 +- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f09abc2..cf3620a 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2413,6 +2413,84 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) return this->file != NULL; } +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ +static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) +{ + static const wchar_t rW[] = {'r',0}; + static const struct { + int mode; + const wchar_t str[4]; + const wchar_t str_bin[4]; + } str_mode[] = { + {OPENMODE_out, {'w',0}, {'w','b',0}}, + {OPENMODE_out|OPENMODE_app, {'a',0}, {'a','b',0}}, + {OPENMODE_app, {'a',0}, {'a','b',0}}, + {OPENMODE_out|OPENMODE_trunc, {'w',0}, {'w','b',0}}, + {OPENMODE_in, {'r',0}, {'r','b',0}}, + {OPENMODE_in|OPENMODE_out, {'r','+',0}, {'r','+','b',0}}, + {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, {'w','+',0}, {'w','+','b',0}}, + {OPENMODE_in|OPENMODE_out|OPENMODE_app, {'a','+',0}, {'a','+','b',0}}, + {OPENMODE_in|OPENMODE_app, {'a','+',0}, {'a','+','b',0}} + }; + + int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); + int mode_idx; + FILE *f = NULL; + + TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); + + for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) + if(str_mode[mode_idx].mode == real_mode) + break; + if(mode_idx == sizeof(str_mode)/sizeof(str_mode[0])) + return NULL; + + if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) + return NULL; + else if(f) + fclose(f); + + if((mode & OPENMODE__Noreplace) && (mode & (OPENMODE_out|OPENMODE_app)) + && (f = _wfopen(name, rW))) { + fclose(f); + return NULL; + } + + f = _wfsopen(name, (mode & OPENMODE_binary) ? str_mode[mode_idx].str_bin + : str_mode[mode_idx].str, prot); + if(!f) + return NULL; + + if((mode & OPENMODE_ate) && fseek(f, 0, SEEK_END)) { + fclose(f); + return NULL; + } + + return f; +} + +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z */ +static FILE* _Fiopen(const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%s %d %d)\n", name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return _Fiopen_wchar(nameW, mode, prot); +} + +/* ?__Fiopen(a)std@@YAPAU_iobuf@@PBDH(a)Z */ +/* ?__Fiopen(a)std@@YAPEAU_iobuf@@PEBDH(a)Z */ +FILE* __cdecl ___Fiopen(const char *name, int mode) +{ + TRACE("(%p %d)\n", name, mode); + return _Fiopen(name, mode, _SH_DENYNO); +} + /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHH(a)Z */ /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHH(a)Z */ DEFINE_THISCALL_WRAPPER(basic_filebuf_char_overflow, 8) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 3e36ca9..e6bf596 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2396,8 +2396,8 @@ @ stub -arch=win64 ?_Xl@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB @ cdecl ?_Xlen(a)std@@YAXXZ() _Xlen @ cdecl ?_Xran(a)std@@YAXXZ() _Xran -@ stub -arch=win32 ?__Fiopen(a)std@@YAPAU_iobuf@@PBDH(a)Z -@ stub -arch=win64 ?__Fiopen(a)std@@YAPEAU_iobuf@@PEBDH(a)Z +@ cdecl -arch=win32 ?__Fiopen(a)std@@YAPAU_iobuf@@PBDH(a)Z(str long) ___Fiopen +@ cdecl -arch=win64 ?__Fiopen(a)std@@YAPEAU_iobuf@@PEBDH(a)Z(str long) ___Fiopen @ stub -arch=win32 ?abs(a)std@@YAMABV?$complex(a)M@1@@Z @ stub -arch=win64 ?abs(a)std@@YAMAEBV?$complex(a)M@1@@Z @ stub -arch=win32 ?abs(a)std@@YANABV?$complex(a)N@1@@Z

1 0

Nikolay Sivov : dwrite: Add family name to string array.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 98ce55c148bcad1122a85df7dd1c2229074ee1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ce55c148bcad1122a85df7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 17:13:29 2012 -0400 dwrite: Add family name to string array. --- dlls/dwrite/dwrite_private.h | 11 +++++++++ dlls/dwrite/font.c | 10 +++++++- dlls/dwrite/main.c | 47 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cba8130..a754f42 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -23,6 +23,16 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); @@ -47,3 +57,4 @@ extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3890f89..4acd35f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -471,9 +471,15 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, names); - return create_localizedstrings(names); + TRACE("(%p)->(%p)\n", This, names); + + hr = create_localizedstrings(names); + if (FAILED(hr)) return hr; + + return add_localizedstring(*names, enusW, This->familyname); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 679416b..b056cb1 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -172,9 +172,18 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT return S_OK; } +struct localizedpair { + WCHAR *locale; + WCHAR *string; +}; + struct localizedstrings { IDWriteLocalizedStrings IDWriteLocalizedStrings_iface; LONG ref; + + struct localizedpair *data; + UINT32 count; + UINT32 alloc; }; static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWriteLocalizedStrings *iface) @@ -215,8 +224,17 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) TRACE("(%p)->(%d)\n", This, ref); - if (!ref) + if (!ref) { + int i; + + for (i = 0; i < This->count; i++) { + heap_free(This->data[i].locale); + heap_free(This->data[i].string); + } + + heap_free(This->data); heap_free(This); + } return S_OK; } @@ -224,8 +242,8 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->count; } static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, @@ -287,12 +305,35 @@ HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) This->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; This->ref = 1; + This->count = 0; + This->data = heap_alloc_zero(sizeof(struct localizedpair)); + if (!This->data) { + heap_free(This); + return E_OUTOFMEMORY; + } + This->alloc = 1; *strings = &This->IDWriteLocalizedStrings_iface; return S_OK; } +HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + + if (This->count == This->alloc) { + This->alloc *= 2; + This->data = heap_realloc(This->data, This->alloc*sizeof(struct localizedpair)); + } + + This->data[This->count].locale = heap_strdupW(locale); + This->data[This->count].string = heap_strdupW(string); + This->count++; + + return S_OK; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj);

1 0

Nikolay Sivov : dwrite: Added IDWriteFontFace stub.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 41df37f17d0fe1a0d678e60dd8c86417cc8cb7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41df37f17d0fe1a0d678e60dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 15:03:52 2012 -0400 dwrite: Added IDWriteFontFace stub. --- dlls/dwrite/font.c | 220 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 51 +++++++++++ include/dwrite.idl | 2 +- 3 files changed, 270 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41df37f17d0fe1a0d678e…

1 0