October 2011 - Wine-Commits

Thomas Faber : riched20: Constify some ME_Context pointer parameters.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 28cb0b683e0845b78dd7562d328f5a7146876a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cb0b683e0845b78dd7562d3… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Oct 22 18:11:27 2011 +0200 riched20: Constify some ME_Context pointer parameters. --- dlls/riched20/editor.h | 8 ++++---- dlls/riched20/paint.c | 8 ++++---- dlls/riched20/richole.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a0387ac..8cded51 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,8 +214,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) DECLSPEC_HIDDEN; void ME_InvalidateSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) DECLSPEC_HIDDEN; -int ME_twips2pointsX(ME_Context *c, int x) DECLSPEC_HIDDEN; -int ME_twips2pointsY(ME_Context *c, int y) DECLSPEC_HIDDEN; +int ME_twips2pointsX(const ME_Context *c, int x) DECLSPEC_HIDDEN; +int ME_twips2pointsY(const ME_Context *c, int y) DECLSPEC_HIDDEN; /* scroll functions in paint.c */ @@ -229,12 +229,12 @@ void ME_ScrollRight(ME_TextEditor *editor, int cx) DECLSPEC_HIDDEN; void ME_UpdateScrollBar(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* other functions in paint.c */ -int ME_GetParaBorderWidth(ME_Context *c, int flags) DECLSPEC_HIDDEN; +int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; -void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; +void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0655010..6b13fb5 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -169,7 +169,7 @@ ME_RewrapRepaint(ME_TextEditor *editor) ME_Repaint(editor); } -int ME_twips2pointsX(ME_Context *c, int x) +int ME_twips2pointsX(const ME_Context *c, int x) { if (c->editor->nZoomNumerator == 0) return x * c->dpi.cx / 1440; @@ -177,7 +177,7 @@ int ME_twips2pointsX(ME_Context *c, int x) return x * c->dpi.cx * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } -int ME_twips2pointsY(ME_Context *c, int y) +int ME_twips2pointsY(const ME_Context *c, int y) { if (c->editor->nZoomNumerator == 0) return y * c->dpi.cy / 1440; @@ -489,7 +489,7 @@ static const COLORREF pen_colors[16] = { /* Dark gray */ RGB(0x80, 0x80, 0x80), /* Light gray */ RGB(0xc0, 0xc0, 0xc0), }; -static int ME_GetBorderPenWidth(ME_Context* c, int idx) +static int ME_GetBorderPenWidth(const ME_Context* c, int idx) { int width = border_details[idx].width; @@ -502,7 +502,7 @@ static int ME_GetBorderPenWidth(ME_Context* c, int idx) return width; } -int ME_GetParaBorderWidth(ME_Context* c, int flags) +int ME_GetParaBorderWidth(const ME_Context* c, int flags) { int idx = (flags >> 8) & 0xF; int width; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 840678d..8e90204 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1526,7 +1526,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) return 1; } -static void convert_sizel(ME_Context *c, const SIZEL* szl, SIZE* sz) +static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */ sz->cx = MulDiv(szl->cx, c->dpi.cx, 2540); @@ -1538,7 +1538,7 @@ static void convert_sizel(ME_Context *c, const SIZEL* szl, SIZE* sz) * * Sets run extent for OLE objects. */ -void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize) +void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) { IDataObject* ido; FORMATETC fmt;

1 0

Thomas Faber : gdi32/tests: Test GetTextExtentExPoint behavior with zero and negative max extent values .
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 0a44501a4ebe3d34ddb784cf7f8a5b2c1733e08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a44501a4ebe3d34ddb784cf7… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Oct 23 11:23:06 2011 +0200 gdi32/tests: Test GetTextExtentExPoint behavior with zero and negative max extent values. --- dlls/gdi32/tests/font.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3d24555..30296a5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1133,6 +1133,39 @@ static void test_text_extents(void) ret = GetTextExtentExPointW(hdc, wt, -1, 0, NULL, NULL, &sz1); ok(ret == FALSE, "got %d\n", ret); + /* max_extent = 0 succeeds and returns zero */ + fit1 = fit2 = -215; + ret = GetTextExtentExPointA(hdc, NULL, 0, 0, &fit1, NULL, &sz); + ok(ret == TRUE || + broken(ret == FALSE), /* NT4, 2k */ + "got %d\n", ret); + ok(fit1 == 0 || + broken(fit1 == -215), /* NT4, 2k */ + "fit = %d\n", fit1); + ret = GetTextExtentExPointW(hdc, NULL, 0, 0, &fit2, NULL, &sz1); + ok(ret == TRUE, "got %d\n", ret); + ok(fit2 == 0, "fit = %d\n", fit2); + + /* max_extent = -1 is interpreted as a very large width that will + * definitely fit our three characters */ + fit1 = fit2 = -215; + ret = GetTextExtentExPointA(hdc, "One", 3, -1, &fit1, NULL, &sz); + ok(ret == TRUE, "got %d\n", ret); + todo_wine ok(fit1 == 3, "fit = %d\n", fit1); + ret = GetTextExtentExPointW(hdc, wt, 3, -1, &fit2, NULL, &sz); + ok(ret == TRUE, "got %d\n", ret); + todo_wine ok(fit2 == 3, "fit = %d\n", fit2); + + /* max_extent = -2 is interpreted similarly, but the Ansi version + * rejects it while the Unicode one accepts it */ + fit1 = fit2 = -215; + ret = GetTextExtentExPointA(hdc, "One", 3, -2, &fit1, NULL, &sz); + todo_wine ok(ret == FALSE, "got %d\n", ret); + todo_wine ok(fit1 == -215, "fit = %d\n", fit1); + ret = GetTextExtentExPointW(hdc, wt, 3, -2, &fit2, NULL, &sz); + ok(ret == TRUE, "got %d\n", ret); + todo_wine ok(fit2 == 3, "fit = %d\n", fit2); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont); ReleaseDC(NULL, hdc);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: a54ab0782320159cd7e53fdc7865a1ef738bc465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54ab0782320159cd7e53fdc7… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Oct 22 10:26:03 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 58 ++++++++++++++++++++++++---------------------------------- 1 files changed, 24 insertions(+), 34 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5591632..e2eacc8 100644 --- a/po/lt.po +++ b/po/lt.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: 2011-10-20 22:44+0300\n" +"PO-Revision-Date: 2011-10-22 10:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2971,7 +2971,7 @@ msgstr "Automatinis duomenų segmentas viršija 64k\n" #: winerror.mc:791 msgid "Ring 2 segment must be movable\n" -msgstr "Antro žiedo segmentas turi būti perkeliamas\n" +msgstr "Antrojo žiedo segmentas turi būti perkeliamas\n" #: winerror.mc:796 msgid "Relocation chain exceeds segment limit in %1\n" @@ -2995,7 +2995,7 @@ msgstr "Failo vardas per ilgas\n" #: winerror.mc:821 msgid "Ring 2 stack in use\n" -msgstr "Antro žiedo dėklas naudojamas\n" +msgstr "Antrojo žiedo dėklas naudojamas\n" #: winerror.mc:826 msgid "Error in use of filename wildcards\n" @@ -4513,7 +4513,7 @@ msgstr "Įvykių žurnalo failas pasikeitė\n" #: winerror.mc:2726 msgid "Installer service failed.\n" -msgstr "Diegimo programos tarnybos klaida\n" +msgstr "Diegimo programos tarnybos klaida.\n" #: winerror.mc:2731 msgid "Installation aborted by user\n" @@ -7687,9 +7687,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s: failas nerastas\n" +msgstr "%1: failas nerastas\n" #: attrib.rc:47 msgid "" @@ -7790,12 +7789,12 @@ msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <direktorija> yra trumpa CHDIR versija. Pakeičia dabartinį\n" +"CD <katalogas> yra trumpa CHDIR versija. Pakeičia dabartinį\n" "numatytą katalogą.\n" #: cmd.rc:41 msgid "CHDIR <dir> changes the current default directory.\n" -msgstr "CHDIR <direktorija> pakeičia dabartinį numatytą katalogą.\n" +msgstr "CHDIR <katalogas> pakeičia dabartinį numatytą katalogą.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -8609,14 +8608,12 @@ msgstr "" "Kur „tarnyba“ yra stabdomos tarnybos pavadinimas.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "Stabdoma priklausoma tarnyba: %s\n" +msgstr "Stabdoma priklausoma tarnyba: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "Nepavyko sustabdyti tarnybos %s\n" +msgstr "Nepavyko sustabdyti tarnybos %1\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8627,34 +8624,28 @@ msgid "Could not get handle to service.\n" msgstr "Nepavyko gauti tarnybos rodyklės.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "Tarnyba %s yra paleidžiama.\n" +msgstr "Tarnyba %1 yra paleidžiama.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "Tarnyba %s sėkmingai paleista.\n" +msgstr "Tarnyba %1 sėkmingai paleista.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "Tarnyba %s nepasileido.\n" +msgstr "Tarnyba %1 nepasileido.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "Tarnyba %s yra stabdoma.\n" +msgstr "Tarnyba %1 yra stabdoma.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "Tarnyba %s sėkmingai sustabdyta.\n" +msgstr "Tarnyba %1 sėkmingai sustabdyta.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "Tarnyba %s nesustojo.\n" +msgstr "Tarnyba %1 nesustojo.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8671,9 +8662,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s Atverti ištekliai: %lu\n" +msgstr "%1 %2 %3 Atverti ištekliai: %4!u!\n" #: net.rc:44 msgid "OK" @@ -8835,7 +8825,7 @@ msgid "" "Do you want to create a new file?" msgstr "" "Failas „%s“\n" -"neegzistuoja\n" +"neegzistuoja.\n" "\n" "Ar norite sukurti naują failą?" @@ -8846,7 +8836,7 @@ msgid "" "Would you like to save the changes?" msgstr "" "Failas „%s“\n" -"buvo pakeistas\n" +"buvo pakeistas.\n" "\n" "Ar norite išsaugoti pakeitimus?" @@ -10227,7 +10217,7 @@ msgid "" "sure you want to change the priority class?" msgstr "" "ĮSPĖJIMAS: Šio proceso prioriteto klasės keitimas gali\n" -"sukelti nepageidaujamų pasekmių, tarp jų sistemos nestabilumą\n" +"sukelti nepageidaujamų pasekmių, tarp jų sistemos nestabilumą.\n" "Ar tikrai norite pakeisti prioriteto klasę?" #: taskmgr.rc:305 @@ -11034,7 +11024,7 @@ msgstr "&Visada viršuje" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Apie Wine žinyną..." +msgstr "&Apie Wine žinyną" #: winhlp32.rc:64 msgid "Annotation..." @@ -11353,7 +11343,7 @@ msgstr "Nepavyko paleisti Wordpad" #: xcopy.rc:27 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Neteisingas parametrų skaičius - pagalba: xcopy /?\n" +msgstr "Neteisingas parametrų skaičius – pagalba: xcopy /?\n" #: xcopy.rc:28 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" @@ -11365,11 +11355,11 @@ msgstr "Spauskite <įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" -msgstr "bus nukopijuota failų: %1!d!\n" +msgstr "Bus nukopijuota failų: %1!d!\n" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" -msgstr "nukopijuota failų: %1!d!\n" +msgstr "Nukopijuota failų: %1!d!\n" #: xcopy.rc:34 msgid "" @@ -11399,7 +11389,7 @@ msgstr "Nepavyko atverti „%1“\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" -msgstr "Klaida skaitant „1“\n" +msgstr "Klaida skaitant „%1“\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Aurimas Fišeras : dinput: Add Lithuanian translation.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 8991a96885ede4920e6b68e4762e734cf12e8626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8991a96885ede4920e6b68e47… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Oct 21 18:39:13 2011 +0300 dinput: Add Lithuanian translation. --- dlls/dinput/Makefile.in | 3 ++- dlls/dinput/dinput_Lt.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 0007506..62b9f32 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ dinput.rc \ dinput_En.rc \ dinput_It.rc \ - dinput_Ko.rc + dinput_Ko.rc \ + dinput_Lt.rc @MAKE_DLL_RULES@ diff --git a/dlls/dinput/dinput_Lt.rc b/dlls/dinput/dinput_Lt.rc new file mode 100644 index 0000000..d674963 --- /dev/null +++ b/dlls/dinput/dinput_Lt.rc @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CONFIGUREDEVICES DIALOG 0, 0, 270, 260 +STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE +CAPTION "Įtaisų konfigūravimas" +FONT 8, "Ms Shell Dlg" +{ + DEFPUSHBUTTON "Gerai", IDOK, 10, 236, 50, 14 + DEFPUSHBUTTON "Atsisakyti", IDCANCEL, 65, 236, 50, 14 + DEFPUSHBUTTON "Atkurti", IDC_RESET, 210, 236, 50, 14 + COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Žaidėjas", IDC_PLAYERTEXT, 10, 40, 32, 8, SS_LEFT + LTEXT "Įtaisas", IDC_DEVICETEXT, 10, 10, 32, 8, SS_LEFT + LTEXT "Veiksmai", IDC_ACTIONTEXT, 10, 70, 32, 8, SS_LEFT + LTEXT "Susiejimas", IDC_MAPPINGTEXT, 120, 8, 32, 8, SS_LEFT + LISTBOX IDC_ACTIONLIST, 10, 80, 90, 130, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + AUTOCHECKBOX "Rikiuoti priskirtus", IDC_CHECKBOXSORT, 120, 215, 70, 8 + CONTROL "Listview", IDC_DEVICEOBJECTSLIST, "SysListView32", LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 120, 20, 140, 190 +}

1 0

Alexandre Julliard : gdi32: Implement GetTextMetrics as a standard driver entry point.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 20070d0838e5b28a75a64a1a26ef3eef14eeb80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20070d0838e5b28a75a64a1a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:12:23 2011 +0200 gdi32: Implement GetTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 10 +++------- dlls/gdi32/freetype.c | 22 +++++++++++----------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d08ba4b..9770f1e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1222,17 +1222,13 @@ BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) */ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) { + PHYSDEV physdev; BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if (dc->gdiFont) - ret = WineEngGetTextMetrics(dc->gdiFont, metrics); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); - } + physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); if (ret) { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad20bf8..a2b57eb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6209,16 +6209,22 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, } /************************************************************* - * WineEngGetTextMetrics - * + * freetype_GetTextMetrics */ -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) +static BOOL freetype_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); BOOL ret; + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); + return dev->funcs->pGetTextMetrics( dev, metrics ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_text_metrics( font, ptm ); + ret = get_text_metrics( physdev->font, metrics ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7089,7 +7095,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextMetrics */ + freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ NULL, /* pLineTo */ @@ -7196,12 +7202,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, return GDI_ERROR; } -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, OUTLINETEXTMETRICW *potm) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ad7b049..51fbf2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -312,7 +312,6 @@ extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) D extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a few helper functions for computing font metrics.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: ca4177997c01d69795cabbc5a8dccb4122b08ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4177997c01d69795cabbc5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:09:33 2011 +0200 gdi32: Add a few helper functions for computing font metrics. --- dlls/gdi32/freetype.c | 192 ++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca4177997c01d69795cab…

1 0

Frédéric Delanoy : opengl32: Avoid superfluous ( void*) cast in LOAD_FUNCPTR macro.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 812c06ae94a2352427c7e3ccc4b55c56b70ce787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812c06ae94a2352427c7e3ccc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 22 14:59:00 2011 +0200 opengl32: Avoid superfluous (void*) cast in LOAD_FUNCPTR macro. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f6cf469..cd60eb2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -345,7 +345,7 @@ static void *load_libglu(void) return NULL; } -#define LOAD_FUNCPTR(f) if((p##f = (void*)wine_dlsym(handle, #f, NULL, 0)) == NULL) goto sym_not_found; +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(handle, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(gluNewTess) LOAD_FUNCPTR(gluDeleteTess) LOAD_FUNCPTR(gluTessBeginContour)

1 0

Thomas Faber : riched20: Avoid a forward declaration.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: f3a3ce8a5129a2a46b13352d66b4d776306190f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a3ce8a5129a2a46b13352d6… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Oct 22 20:17:04 2011 +0200 riched20: Avoid a forward declaration. --- dlls/riched20/wrap.c | 75 ++++++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 2ec67ab..e06db72 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -480,7 +480,42 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; } -static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { + ME_DisplayItem *p, *pRow; + + tp->member.para.nWidth = 0; + /* remove all items that will be reinserted by paragraph wrapper anyway */ + tp->member.para.nRows = 0; + for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { + switch(p->type) { + case diStartRow: + pRow = p; + p = p->prev; + ME_Remove(pRow); + ME_DestroyDisplayItem(pRow); + break; + default: + break; + } + } + /* join runs that can be joined, set up flags */ + for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { + switch(p->type) { + case diStartRow: assert(0); break; /* should have deleted it */ + case diRun: + while (p->next->type == diRun) { /* FIXME */ + if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { + ME_JoinRuns(c->editor, p); + } + else + break; + } + break; + default: + break; + } + } +} static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p; @@ -558,44 +593,6 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { tp->member.para.nRows = wc.nRow; } - -static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p, *pRow; - - tp->member.para.nWidth = 0; - /* remove all items that will be reinserted by paragraph wrapper anyway */ - tp->member.para.nRows = 0; - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: - pRow = p; - p = p->prev; - ME_Remove(pRow); - ME_DestroyDisplayItem(pRow); - break; - default: - break; - } - } - /* join runs that can be joined, set up flags */ - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: assert(0); break; /* should have deleted it */ - case diRun: - while (p->next->type == diRun) { /* FIXME */ - if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { - ME_JoinRuns(c->editor, p); - } - else - break; - } - break; - default: - break; - } - } -} - BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item;

1 0

Alexandre Julliard : mmdevapi/tests: Don't crash on test failure.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 6c68319863ee68f97e113d291b1501d15b5d095a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c68319863ee68f97e113d291… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 14:28:08 2011 +0200 mmdevapi/tests: Don't crash on test failure. --- dlls/mmdevapi/tests/render.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 494c00d..ff0aa62 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -719,6 +719,7 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac1); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) return; hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); @@ -730,6 +731,11 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac2); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) + { + IAudioClient_Release(ses1_ac1); + return; + } hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid);

1 0

Marcus Meissner : kernel32: Avoid shadowing parameter "len".
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: db7ba0b230a5a68274c0db5a204df4b1e1be6c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7ba0b230a5a68274c0db5a2… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Oct 21 08:19:31 2011 +0200 kernel32: Avoid shadowing parameter "len". --- dlls/kernel32/profile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index a2bd5b5..89b96a1 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1113,11 +1113,11 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (p >= def_val) { - int len = (int)(p - def_val) + 1; + int vlen = (int)(p - def_val) + 1; - defval_tmp = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - memcpy(defval_tmp, def_val, len * sizeof(WCHAR)); - defval_tmp[len] = '\0'; + defval_tmp = HeapAlloc(GetProcessHeap(), 0, (vlen + 1) * sizeof(WCHAR)); + memcpy(defval_tmp, def_val, vlen * sizeof(WCHAR)); + defval_tmp[vlen] = '\0'; def_val = defval_tmp; } }

1 0