September 2011 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Store calendars matrix dimensions instead of overall count.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: e716421393ca0e1315fbc718eb5fcba02e4f1616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e716421393ca0e1315fbc718e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 21:45:07 2011 +0400 comctl32/monthcal: Store calendars matrix dimensions instead of overall count. --- dlls/comctl32/monthcal.c | 52 ++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ae9bdcd..07a8783 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -151,7 +151,7 @@ typedef struct WNDPROC EditWndProc; /* original Edit window procedure */ CALENDAR_INFO *calendars; - INT cal_num; + SIZE dim; /* [cx,cy] - dimensions of calendars matrix, row/column count */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; @@ -170,6 +170,10 @@ enum nav_direction }; /* helper functions */ +static inline INT MONTHCAL_GetCalCount(const MONTHCAL_INFO *infoPtr) +{ + return infoPtr->dim.cx * infoPtr->dim.cy; +} /* send a single MCN_SELCHANGE notification */ static inline void MONTHCAL_NotifySelectionChange(const MONTHCAL_INFO *infoPtr) @@ -517,7 +521,7 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) { /* the latest date is in latest calendar */ - SYSTEMTIME st, lt_month = infoPtr->calendars[infoPtr->cal_num-1].month; + SYSTEMTIME st, lt_month = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; *date = lt_month; MONTHCAL_GetNextMonth(date); @@ -571,7 +575,7 @@ static void MONTHCAL_GetDayPos(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *d st.wDay = 1; first = (MONTHCAL_CalculateDayOfWeek(&st, FALSE) + 6 - infoPtr->firstDay) % 7; - if (calIdx == 0 || calIdx == infoPtr->cal_num-1) { + if (calIdx == 0 || calIdx == MONTHCAL_GetCalCount(infoPtr)-1) { const SYSTEMTIME *cal = &infoPtr->calendars[calIdx].month; LONG cmp = MONTHCAL_CompareMonths(date, &st); @@ -618,12 +622,12 @@ static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTE calIdx = 0; else { - cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[infoPtr->cal_num-1].month); + cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month); if (cmp >= 0) - calIdx = infoPtr->cal_num-1; + calIdx = MONTHCAL_GetCalCount(infoPtr)-1; else { - for (calIdx = 1; calIdx < infoPtr->cal_num-1; calIdx++) + for (calIdx = 1; calIdx < MONTHCAL_GetCalCount(infoPtr)-1; calIdx++) if (MONTHCAL_CompareMonths(date, &infoPtr->calendars[calIdx].month) == 0) break; } @@ -1006,7 +1010,7 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, } /* draw next month */ - st = infoPtr->calendars[infoPtr->cal_num-1].month; + st = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; st.wDay = 1; MONTHCAL_GetNextMonth(&st); MONTHCAL_GetMaxDate(infoPtr, &st_max); @@ -1088,7 +1092,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT old_bk_clr = GetBkColor(hdc); old_font = GetCurrentObject(hdc, OBJ_FONT); - for (i = 0; i < infoPtr->cal_num; i++) + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { RECT *title = &infoPtr->calendars[i].title; RECT r; @@ -1310,7 +1314,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) case GMR_VISIBLE: { st[0] = infoPtr->calendars[0].month; - st[1] = infoPtr->calendars[infoPtr->cal_num-1].month; + st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; if (st[0].wMonth == min_allowed_date.wMonth && st[0].wYear == min_allowed_date.wYear) @@ -1324,7 +1328,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); - return infoPtr->cal_num; + return MONTHCAL_GetCalCount(infoPtr); } case GMR_DAYSTATE: { @@ -1634,7 +1638,7 @@ static INT MONTHCAL_GetCalendarFromPoint(const MONTHCAL_INFO *infoPtr, const POI RECT r; INT i; - for (i = 0; i < infoPtr->cal_num; i++) + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { /* whole bounding rectangle allows some optimization to compute */ r.left = infoPtr->calendars[i].title.left; @@ -1836,7 +1840,7 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) { INT i, selIdx = -1; - for(i = 0; i < infoPtr->cal_num; i++) + for(i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { /* save selection position to shift it later */ if (selIdx == -1 && MONTHCAL_CompareMonths(&infoPtr->minSel, &infoPtr->calendars[i].month) == 0) @@ -1866,7 +1870,7 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { - INT delta = infoPtr->delta ? infoPtr->delta : infoPtr->cal_num; + INT delta = infoPtr->delta ? infoPtr->delta : MONTHCAL_GetCalCount(infoPtr); SYSTEMTIME st; TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); @@ -1879,7 +1883,7 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct } else { - st = infoPtr->calendars[infoPtr->cal_num-1].month; + st = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; MONTHCAL_GetMonth(&st, delta); } @@ -2067,7 +2071,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) /* check if change allowed by range set */ st = delta < 0 ? infoPtr->calendars[0].month : - infoPtr->calendars[infoPtr->cal_num-1].month; + infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; MONTHCAL_GetMonth(&st, delta); if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) @@ -2349,10 +2353,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) TEXTMETRICW tm; HFONT currentFont; INT xdiv, dx, dy, i; - RECT rcClient; + RECT client; WCHAR buff[80]; - GetClientRect(infoPtr->hwndSelf, &rcClient); + GetClientRect(infoPtr->hwndSelf, &client); currentFont = SelectObject(hdc, infoPtr->hFont); @@ -2433,8 +2437,8 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) todayrect->bottom = days->bottom + infoPtr->height_increment; /* offset all rectangles to center in client area */ - dx = (rcClient.right - title->right) / 2; - dy = (rcClient.bottom - todayrect->bottom) / 2; + dx = (client.right - title->right) / 2; + dy = (client.bottom - todayrect->bottom) / 2; /* if calendar doesn't fit client area show it at left/top bounds */ if (title->left + dx < 0) dx = 0; @@ -2453,9 +2457,12 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) OffsetRect(todayrect, dx, dy); } + /* TODO: update calendars count */ + infoPtr->dim.cx = infoPtr->dim.cy = 1; + TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, - wine_dbgstr_rect(&rcClient), + wine_dbgstr_rect(&client), wine_dbgstr_rect(title), wine_dbgstr_rect(wdays), wine_dbgstr_rect(days), @@ -2569,8 +2576,6 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->calendars = Alloc(sizeof(CALENDAR_INFO)); if (!infoPtr->calendars) goto fail; - infoPtr->cal_num = 1; - MONTHCAL_SetFont(infoPtr, GetStockObject(DEFAULT_GUI_FONT), FALSE); /* initialize info structure */ @@ -2604,8 +2609,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->calendars[0].month = infoPtr->todaysDate; infoPtr->isUnicode = TRUE; - /* call MONTHCAL_UpdateSize to set all of the dimensions */ - /* of the control */ + /* set all control dimensions */ MONTHCAL_UpdateSize(infoPtr); /* today auto update timer, to be freed only on control destruction */

1 0

Nikolay Sivov : comctl32/monthcal: Properly compute maximum date for control.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: fec346b36dcf50c5e986d56ff5af686f3b609c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec346b36dcf50c5e986d56ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 14 22:59:13 2011 +0400 comctl32/monthcal: Properly compute maximum date for control. --- dlls/comctl32/monthcal.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 07a8783..5a6f326 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -521,15 +521,27 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) { /* the latest date is in latest calendar */ - SYSTEMTIME st, lt_month = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + SYSTEMTIME st, *lt_month = &infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + INT first_day; + + *date = *lt_month; + st = *lt_month; + + /* day of week of first day of current month */ + st.wDay = 1; + first_day = MONTHCAL_CalculateDayOfWeek(&st, FALSE); - *date = lt_month; MONTHCAL_GetNextMonth(date); + MONTHCAL_GetPrevMonth(&st); + + /* last calendar starts with some date from previous month that not displayed */ + st.wDay = MONTHCAL_MonthLength(st.wMonth, st.wYear) + + (infoPtr->firstDay - first_day) % 7 + 1; + if (st.wDay > MONTHCAL_MonthLength(st.wMonth, st.wYear)) st.wDay -= 7; - MONTHCAL_GetMinDate(infoPtr, &st); /* Use month length to get max day. 42 means max day count in calendar area */ date->wDay = 42 - (MONTHCAL_MonthLength(st.wMonth, st.wYear) - st.wDay + 1) - - MONTHCAL_MonthLength(lt_month.wMonth, lt_month.wYear); + MONTHCAL_MonthLength(lt_month->wMonth, lt_month->wYear); /* fix day of week */ MONTHCAL_CalculateDayOfWeek(date, TRUE);

1 0

Francois Gouget : shlwapi/tests: Fix test_StrFromTimeIntervalA() to print the badly formatted string in case of a failure.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 0ae12c4a3b5046ad697cae4d63000b8a9f4e52b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae12c4a3b5046ad697cae4d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 08:53:40 2011 +0200 shlwapi/tests: Fix test_StrFromTimeIntervalA() to print the badly formatted string in case of a failure. --- dlls/shlwapi/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 64e5b59..4b984ce 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -607,8 +607,8 @@ static void test_StrFromTimeIntervalA(void) { StrFromTimeIntervalA(szBuff, 256, result->ms, result->digits); - ok(!strcmp(result->time_interval, szBuff), "Formatted %d %d wrong\n", - result->ms, result->digits); + ok(!strcmp(result->time_interval, szBuff), "Formatted %d %d wrong: %s\n", + result->ms, result->digits, szBuff); result++; } }

1 0

Francois Gouget : winetest: Also log the current thread and default user UI languages.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 49a545685c5525fddf5414066e7ba5e563267dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a545685c5525fddf5414066… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 08:55:07 2011 +0200 winetest: Also log the current thread and default user UI languages. --- programs/winetest/main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4846344..3f6dd6b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -391,9 +391,21 @@ static void print_version (void) static void print_language(void) { + HMODULE hkernel32; + LANGID (WINAPI *pGetUserDefaultUILanguage)(void); + LANGID (WINAPI *pGetThreadUILanguage)(void); + xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); xprintf (" ThreadLocale=%x\n", GetThreadLocale()); + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + if (pGetUserDefaultUILanguage) + xprintf (" UserDefaultUILanguage=%x\n", pGetUserDefaultUILanguage()); + if (pGetThreadUILanguage) + xprintf (" ThreadUILanguage=%x\n", pGetThreadUILanguage()); } static inline int is_dot_dir(const char* x)

1 0

Francois Gouget : shlwapi/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 74459389a5e91566341568644933ee85dfd5d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74459389a5e91566341568644… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 09:36:43 2011 +0200 shlwapi/tests: Some tests require that the user interface be in English. With MUI versions of Windows checking for the default user language id or locale is insufficient. --- dlls/shlwapi/tests/string.c | 44 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 4b984ce..5522137 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -197,6 +197,39 @@ static const StrFromTimeIntervalResult StrFromTimeInterval_results[] = { { 0, 0, NULL } }; + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + +/* Returns true if the dates, numbers, etc. are formatted using English + * conventions. + */ +static BOOL is_locale_english(void) +{ + /* Surprisingly GetThreadLocale() is irrelevant here */ + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_StrChrA(void) { char string[129]; @@ -1405,15 +1438,18 @@ START_TEST(string) test_StrDupA(); /* language-dependent test */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) - skip("English is required for StrFromTimeInterval and StrFormat*Size tests\n"); - else + if (is_lang_english() && is_locale_english()) { test_StrFormatByteSize64A(); test_StrFormatKBSizeA(); test_StrFormatKBSizeW(); - test_StrFromTimeIntervalA(); } + else + skip("An English UI and locale is required for the StrFormat*Size tests\n"); + if (is_lang_english()) + test_StrFromTimeIntervalA(); + else + skip("An English UI is required for the StrFromTimeInterval tests\n"); test_StrCmpA(); test_StrCmpW();

1 0

Francois Gouget : mshtml/tests: Improve the current UI language detection a bit.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 25100a8592856a59c972b9eef1e096622d9ba0dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=25100a8592856a59c972b9eef… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 11:01:01 2011 +0200 mshtml/tests: Improve the current UI language detection a bit. --- dlls/mshtml/tests/htmldoc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 03f2539..f7aef38 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -283,16 +283,23 @@ static BSTR a2bstr(const char *str) return ret; } -static BOOL is_english(void) +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) { static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; if (!hkernel32) { hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; if (pGetUserDefaultUILanguage) return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; @@ -1629,7 +1636,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, if(expect_InPlaceUIWindow_SetActiveObject_active) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - if(pActiveObject && is_english()) + if(pActiveObject && is_lang_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); } else { @@ -1649,7 +1656,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, if(pActiveObject) { CHECK_EXPECT2(SetActiveObject); - if(pActiveObject && is_english()) + if(pActiveObject && is_lang_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); }else { CHECK_EXPECT(SetActiveObject_null);

1 0

Francois Gouget : po: Remove English strings from the Portuguese (Brazil) translation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: d00a00e5205731206e0c2852c07917ee82b4ca07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00a00e5205731206e0c2852c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:54:23 2011 +0200 po: Remove English strings from the Portuguese (Brazil) translation. --- po/pt_BR.po | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index aa91fee..06ec4ff 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6440,7 +6440,7 @@ msgstr "Wine Internet Explorer" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252 @@ -8464,16 +8464,12 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> saves the current directory onto a\n" -"stack, and then changes the current directory to the supplied one.\n" #: cmd.rc:223 msgid "" "POPD changes current directory to the last one saved with\n" "PUSHD.\n" msgstr "" -"POPD changes current directory to the last one saved with\n" -"PUSHD.\n" #: cmd.rc:231 msgid "" @@ -8503,7 +8499,7 @@ msgstr "" #: cmd.rc:244 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "MORE displays output of files or piped input in pages.\n" +msgstr "" #: cmd.rc:248 msgid "" @@ -9995,6 +9991,7 @@ msgstr "" "certas condições; execute 'start /L' para detalhes.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -11616,11 +11613,11 @@ msgstr "Uma página" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Francois Gouget : po: Remove English strings from the Portuguese (Portugal) translation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 1a0b723876ddcbf00a1af1d6adf76b518335f9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0b723876ddcbf00a1af1d6a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:54:24 2011 +0200 po: Remove English strings from the Portuguese (Portugal) translation. --- po/pt_PT.po | 152 ++++++++++++++++++++++------------------------------------- 1 files changed, 56 insertions(+), 96 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 428fef2..f4fc864 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3508,7 +3508,7 @@ msgstr "Login do serviço falhou\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -5181,7 +5181,7 @@ msgstr "Erro RPCInternal\n" #: winerror.mc:3251 msgid "RPC divide-by-zero\n" -msgstr "RPC divide-by-zero\n" +msgstr "" #: winerror.mc:3256 msgid "Address error\n" @@ -5189,15 +5189,15 @@ msgstr "Erro de endereço\n" #: winerror.mc:3261 msgid "Floating-point divide-by-zero\n" -msgstr "Floating-point divide-by-zero\n" +msgstr "" #: winerror.mc:3266 msgid "Floating-point underflow\n" -msgstr "Floating-point underflow\n" +msgstr "" #: winerror.mc:3271 msgid "Floating-point overflow\n" -msgstr "Floating-point overflow\n" +msgstr "" #: winerror.mc:3276 msgid "No more entries\n" @@ -5221,7 +5221,7 @@ msgstr "Handle de contexto estragado\n" #: winerror.mc:3301 msgid "Binding handle mismatch\n" -msgstr "Binding handle mismatch\n" +msgstr "" #: winerror.mc:3306 msgid "Cannot get call handle\n" @@ -5643,8 +5643,6 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"The specified installation package could not be opened. Please check the " -"file path and try again." #: msi.rc:28 msgid "path %s not found" @@ -5655,7 +5653,6 @@ msgid "insert disk %s" msgstr "insira o disco %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5687,35 +5684,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6487,7 +6455,7 @@ msgstr "Explorador de Internet Wine" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252 @@ -8017,13 +7985,10 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Not Yet Implemented\n" -"\n" #: attrib.rc:28 cmd.rc:301 -#, fuzzy msgid "%s: File Not Found\n" -msgstr "%s : File Not Found\n" +msgstr "" #: attrib.rc:47 msgid "" @@ -8512,16 +8477,12 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> saves the current directory onto a\n" -"stack, and then changes the current directory to the supplied one.\n" #: cmd.rc:223 msgid "" "POPD changes current directory to the last one saved with\n" "PUSHD.\n" msgstr "" -"POPD changes current directory to the last one saved with\n" -"PUSHD.\n" #: cmd.rc:231 msgid "" @@ -8551,7 +8512,7 @@ msgstr "" #: cmd.rc:244 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "MORE displays output of files or piped input in pages.\n" +msgstr "" #: cmd.rc:248 msgid "" @@ -8642,7 +8603,7 @@ msgstr "" #: cmd.rc:290 msgid "Are you sure" -msgstr "Are you sure" +msgstr "" #: cmd.rc:291 xcopy.rc:40 msgctxt "Yes key" @@ -8656,59 +8617,59 @@ msgstr "N" #: cmd.rc:293 msgid "File association missing for extension %s\n" -msgstr "File association missing for extension %s\n" +msgstr "" #: cmd.rc:294 msgid "No open command associated with file type '%s'\n" -msgstr "No open command associated with file type '%s'\n" +msgstr "" #: cmd.rc:295 msgid "Overwrite %s" -msgstr "Overwrite %s" +msgstr "" #: cmd.rc:296 msgid "More..." -msgstr "More..." +msgstr "" #: cmd.rc:297 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "Line in Batch processing possibly truncated. Using:\n" +msgstr "" #: cmd.rc:299 msgid "Argument missing\n" -msgstr "Argument missing\n" +msgstr "" #: cmd.rc:300 msgid "Syntax error\n" -msgstr "Syntax error\n" +msgstr "" #: cmd.rc:302 msgid "No help available for %s\n" -msgstr "No help available for %s\n" +msgstr "" #: cmd.rc:303 msgid "Target to GOTO not found\n" -msgstr "Target to GOTO not found\n" +msgstr "" #: cmd.rc:304 msgid "Current Date is %s\n" -msgstr "Current Date is %s\n" +msgstr "" #: cmd.rc:305 msgid "Current Time is %s\n" -msgstr "Current Time is %s\n" +msgstr "" #: cmd.rc:306 msgid "Enter new date: " -msgstr "Enter new date: " +msgstr "" #: cmd.rc:307 msgid "Enter new time: " -msgstr "Enter new time: " +msgstr "" #: cmd.rc:308 msgid "Environment variable %s not defined\n" -msgstr "Environment variable %s not defined\n" +msgstr "" #: cmd.rc:309 xcopy.rc:38 msgid "Failed to open '%s'\n" @@ -8716,7 +8677,7 @@ msgstr "Falhou ao abrir '%s'\n" #: cmd.rc:310 msgid "Cannot call batch label outside of a batch script\n" -msgstr "Cannot call batch label outside of a batch script\n" +msgstr "" #: cmd.rc:311 xcopy.rc:42 msgctxt "All key" @@ -8725,23 +8686,23 @@ msgstr "A" #: cmd.rc:312 msgid "%s, Delete" -msgstr "%s, Delete" +msgstr "" #: cmd.rc:313 msgid "Echo is %s\n" -msgstr "Echo is %s\n" +msgstr "" #: cmd.rc:314 msgid "Verify is %s\n" -msgstr "Verify is %s\n" +msgstr "" #: cmd.rc:315 msgid "Verify must be ON or OFF\n" -msgstr "Verify must be ON or OFF\n" +msgstr "" #: cmd.rc:316 msgid "Parameter error\n" -msgstr "Parameter error\n" +msgstr "" #: cmd.rc:317 msgid "" @@ -8749,21 +8710,18 @@ msgid "" "Volume Serial Number is %04x-%04x\n" "\n" msgstr "" -"Volume in drive %c is %s\n" -"Volume Serial Number is %04x-%04x\n" -"\n" #: cmd.rc:318 msgid "Volume label (11 characters, ENTER for none)?" -msgstr "Volume label (11 characters, ENTER for none)?" +msgstr "" #: cmd.rc:319 msgid "PATH not found\n" -msgstr "PATH not found\n" +msgstr "" #: cmd.rc:320 msgid "Press Return key to continue: " -msgstr "Press Return key to continue: " +msgstr "" #: cmd.rc:321 msgid "Wine Command Prompt" @@ -8771,15 +8729,15 @@ msgstr "Wine Command Prompt" #: cmd.rc:322 msgid "CMD Version %s\n" -msgstr "CMD Version %s\n" +msgstr "" #: cmd.rc:323 msgid "More? " -msgstr "More? " +msgstr "" #: cmd.rc:324 msgid "The input line is too long.\n" -msgstr "The input line is too long.\n" +msgstr "" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10049,6 +10007,7 @@ msgstr "" "condições; execute 'start /L' para detalhes.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -10096,7 +10055,7 @@ msgstr "" #: start.rc:68 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "Could not translate the specified Unix filename to a DOS filename." +msgstr "" #: taskkill.rc:27 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" @@ -11023,63 +10982,63 @@ msgstr "Texto da Caixa de Mensagem" #: winecfg.rc:112 msgid "Application Workspace" -msgstr "Application Workspace" +msgstr "" #: winecfg.rc:113 msgid "Window Frame" -msgstr "Window Frame" +msgstr "" #: winecfg.rc:114 msgid "Active Border" -msgstr "Active Border" +msgstr "" #: winecfg.rc:115 msgid "Inactive Border" -msgstr "Inactive Border" +msgstr "" #: winecfg.rc:116 msgid "Controls Shadow" -msgstr "Controls Shadow" +msgstr "" #: winecfg.rc:117 msgid "Gray Text" -msgstr "Gray Text" +msgstr "" #: winecfg.rc:118 msgid "Controls Highlight" -msgstr "Controls Highlight" +msgstr "" #: winecfg.rc:119 msgid "Controls Dark Shadow" -msgstr "Controls Dark Shadow" +msgstr "" #: winecfg.rc:120 msgid "Controls Light" -msgstr "Controls Light" +msgstr "" #: winecfg.rc:121 msgid "Controls Alternate Background" -msgstr "Controls Alternate Background" +msgstr "" #: winecfg.rc:122 msgid "Hot Tracked Item" -msgstr "Hot Tracked Item" +msgstr "" #: winecfg.rc:123 msgid "Active Title Bar Gradient" -msgstr "Active Title Bar Gradient" +msgstr "" #: winecfg.rc:124 msgid "Inactive Title Bar Gradient" -msgstr "Inactive Title Bar Gradient" +msgstr "" #: winecfg.rc:125 msgid "Menu Highlight" -msgstr "Menu Highlight" +msgstr "" #: winecfg.rc:126 msgid "Menu Bar" -msgstr "Menu Bar" +msgstr "" #: wineconsole.rc:26 msgid "Set &Defaults" @@ -11309,6 +11268,7 @@ msgid "Error while selecting new font." msgstr "Erro ao seleccionar novo tipo de letra." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile" @@ -11671,11 +11631,11 @@ msgstr "Uma página" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Alexandre Julliard : winex11: Move the pixel-> color conversion out of the get_tile_pict function.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 85a6967f8dd791c6a6640fc984d3363df2f43897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a6967f8dd791c6a6640fc98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:51:08 2011 +0200 winex11: Move the pixel->color conversion out of the get_tile_pict function. --- dlls/winex11.drv/xrender.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e525d5f..66f8cc3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1869,15 +1869,14 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf * Returns an appropriate Picture for tiling the text colour. * Call and use result within the xrender_cs */ -static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel) +static Picture get_tile_pict(const WineXRenderFormat *wxr_format, const XRenderColor *color) { static struct { Pixmap xpm; Picture pict; - int current_color; + XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; - XRenderColor col; tile = &tiles[wxr_format->format]; @@ -1893,11 +1892,13 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel wine_tsx11_unlock(); /* init current_color to something different from text_pixel */ - tile->current_color = ~text_pixel; + tile->current_color = *color; + tile->current_color.red ^= 0xffff; if(wxr_format->format == WXR_FORMAT_MONO) { /* for a 1bpp bitmap we always need a 1 in the tile */ + XRenderColor col; col.red = col.green = col.blue = 0; col.alpha = 0xffff; wine_tsx11_lock(); @@ -1906,13 +1907,12 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel } } - if(text_pixel != tile->current_color && wxr_format->format != WXR_FORMAT_MONO) + if (memcmp( color, &tile->current_color, sizeof(*color) ) && wxr_format->format != WXR_FORMAT_MONO) { - get_xrender_color(wxr_format, text_pixel, &col); wine_tsx11_lock(); - pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1); + pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, color, 0, 0, 1, 1); wine_tsx11_unlock(); - tile->current_color = text_pixel; + tile->current_color = *color; } return tile->pict; } @@ -2080,6 +2080,7 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, POINT desired, current; int render_op = PictOpOver; Picture pict = get_xrender_picture(physdev->x11dev); + XRenderColor col; /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -2089,7 +2090,8 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, desired.y = physdev->x11dev->dc_rect.top + y; current.x = current.y = 0; - tile_pict = get_tile_pict(physdev->info.format, physdev->x11dev->textPixel); + get_xrender_color(physdev->info.format, physdev->x11dev->textPixel, &col); + tile_pict = get_tile_pict(physdev->info.format, &col); /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. */ @@ -2549,20 +2551,21 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE /* mono -> color */ if(physDevSrc->depth == 1 && physDevDst->depth > 1) { - XRenderColor col; - get_xrender_color(dst_format, physDevDst->textPixel, &col); + XRenderColor fg, bg; + get_xrender_color(dst_format, physDevDst->textPixel, &fg); + get_xrender_color(dst_format, physDevDst->backgroundPixel, &bg); /* We use the source drawable as a mask */ mask_pict = get_xrender_picture_source( physDevSrc, use_repeat ); /* Use backgroundPixel as the foreground color */ EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); + src_pict = get_tile_pict(dst_format, &bg); /* Create a destination picture and fill it with textPixel color as the background color */ wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); + pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height);

1 0

Alexandre Julliard : winex11: Pass destination coordinates to xrender_mono_blit.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: beb71ad9d1b647c0780a809a9d129cb3dbdd5e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb71ad9d1b647c0780a809a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:51:57 2011 +0200 winex11: Pass destination coordinates to xrender_mono_blit. --- dlls/winex11.drv/xrender.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 66f8cc3..5cb2b36 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2357,12 +2357,13 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d /* Helper function for (stretched) mono->color blitting using xrender */ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, - int x_src, int y_src, double xscale, double yscale, int width, int height ) + int x_src, int y_src, int x_dst, int y_dst, + double xscale, double yscale, int width, int height ) { int x_offset, y_offset; /* When doing a mono->color blit, 'src_pict' contains a 1x1 picture for tiling, the actual - * source data is in mask_pict. The 'src_pict' data effectively acts as an alpha channel to the + * source data is in mask_pict. The 'mask_pict' data effectively acts as an alpha channel to the * tile data. We need PictOpOver for correct rendering. * Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using * mask_x / mask_y @@ -2383,7 +2384,7 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ set_xrender_transformation(mask_pict, 1, 1, 0, 0); } pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, - 0, 0, x_offset, y_offset, 0, 0, width, height); + 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); } /*********************************************************************** @@ -2567,7 +2568,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); - xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); + xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, + xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock();

1 0