August 2010 - Wine-Commits - list.winehq.org

Igor Paliychuk : mshtml: Update Ukrainian translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: bdc7ae2e17d87149efbbad35087f48144b2d59a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc7ae2e17d87149efbbad350… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Aug 6 10:54:20 2010 +0300 mshtml: Update Ukrainian translation. --- dlls/mshtml/Uk.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc index 5d57e8f..4d174f5 100644 --- a/dlls/mshtml/Uk.rc +++ b/dlls/mshtml/Uk.rc @@ -24,6 +24,12 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + STRINGTABLE + { + IDS_STATUS_DONE "Готово" + IDS_STATUS_DOWNLOADINGFROM "Завантаження з %s..." +} + STRINGTABLE { IDS_HTMLDISABLED "В даний момент відображення HTML вимкнено."

1 0

Nikolay Sivov : comctl32/monthcal: Support new hittest fields for some cases.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 76d3e1d553df0f8522cd04c242d44d9e2ef2ef07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d3e1d553df0f8522cd04c24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 7 18:07:03 2010 +0400 comctl32/monthcal: Support new hittest fields for some cases. --- dlls/comctl32/monthcal.c | 109 +++++++++++++++++++++++++++------------- dlls/comctl32/tests/monthcal.c | 24 ++++---- 2 files changed, 85 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 130e5f8..0b72603 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -557,7 +557,7 @@ static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, * [O] y : week column (zero based) */ static void MONTHCAL_CalcDayXY(const MONTHCAL_INFO *infoPtr, - const SYSTEMTIME *date, int *x, int *y) + const SYSTEMTIME *date, INT *x, INT *y) { SYSTEMTIME st = infoPtr->minSel; LONG cmp; @@ -1633,10 +1633,22 @@ static INT MONTHCAL_GetCalendarFromPoint(const MONTHCAL_INFO *infoPtr, const POI return -1; } +static inline UINT fill_hittest_info(const MCHITTESTINFO *src, MCHITTESTINFO *dest) +{ + dest->uHit = src->uHit; + dest->st = src->st; + + if (dest->cbSize == sizeof(MCHITTESTINFO)) + memcpy(&dest->rc, &src->rc, sizeof(MCHITTESTINFO) - MCHITTESTINFO_V1_SIZE); + + return src->uHit; +} + static LRESULT MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { INT day, wday, wnum, calIdx; + MCHITTESTINFO htinfo; SYSTEMTIME ht_month; UINT x, y; @@ -1645,7 +1657,11 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) x = lpht->pt.x; y = lpht->pt.y; - memset(&lpht->st, 0, sizeof(lpht->st)); + htinfo.st = st_null; + + /* we should preserve passed fields if hit area doesn't need them */ + if (lpht->cbSize == sizeof(MCHITTESTINFO)) + memcpy(&htinfo.rc, &lpht->rc, sizeof(MCHITTESTINFO) - MCHITTESTINFO_V1_SIZE); /* Comment in for debugging... TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, @@ -1664,12 +1680,15 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if (calIdx == -1) { if (PtInRect(&infoPtr->todayrect, lpht->pt)) - lpht->uHit = MCHT_TODAYLINK; + { + htinfo.uHit = MCHT_TODAYLINK; + htinfo.rc = infoPtr->todayrect; + } else /* outside of calendar area? What's left must be background :-) */ - lpht->uHit = MCHT_CALENDARBK; + htinfo.uHit = MCHT_CALENDARBK; - return lpht->uHit; + return fill_hittest_info(&htinfo, lpht); } ht_month = infoPtr->calendars[calIdx].month; @@ -1680,83 +1699,101 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) two calendars have buttons */ if (calIdx == 0 && PtInRect(&infoPtr->titlebtnprev, lpht->pt)) { - lpht->uHit = MCHT_TITLEBTNPREV; + htinfo.uHit = MCHT_TITLEBTNPREV; + htinfo.rc = infoPtr->titlebtnprev; } else if (PtInRect(&infoPtr->titlebtnnext, lpht->pt)) { - lpht->uHit = MCHT_TITLEBTNNEXT; + htinfo.uHit = MCHT_TITLEBTNNEXT; + htinfo.rc = infoPtr->titlebtnnext; } else if (PtInRect(&infoPtr->calendars[calIdx].titlemonth, lpht->pt)) { - lpht->uHit = MCHT_TITLEMONTH; + htinfo.uHit = MCHT_TITLEMONTH; + htinfo.rc = infoPtr->calendars[calIdx].titlemonth; + htinfo.iOffset = calIdx; } else if (PtInRect(&infoPtr->calendars[calIdx].titleyear, lpht->pt)) { - lpht->uHit = MCHT_TITLEYEAR; + htinfo.uHit = MCHT_TITLEYEAR; + htinfo.rc = infoPtr->calendars[calIdx].titleyear; + htinfo.iOffset = calIdx; } else - lpht->uHit = MCHT_TITLE; + { + htinfo.uHit = MCHT_TITLE; + htinfo.rc = infoPtr->calendars[calIdx].title; + htinfo.iOffset = calIdx; + } - return lpht->uHit; + return fill_hittest_info(&htinfo, lpht); } /* days area (including week days and week numbers */ day = MONTHCAL_CalcDayFromPos(infoPtr, x, y, &wday, &wnum); if (PtInRect(&infoPtr->calendars[calIdx].wdays, lpht->pt)) { - lpht->uHit = MCHT_CALENDARDAY; - lpht->st.wYear = ht_month.wYear; - lpht->st.wMonth = (day < 1) ? ht_month.wMonth -1 : ht_month.wMonth; - lpht->st.wDay = (day < 1) ? + htinfo.uHit = MCHT_CALENDARDAY; + htinfo.iOffset = calIdx; + htinfo.st.wYear = ht_month.wYear; + htinfo.st.wMonth = (day < 1) ? ht_month.wMonth -1 : ht_month.wMonth; + htinfo.st.wDay = (day < 1) ? MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day : day; + + MONTHCAL_CalcDayXY(infoPtr, &htinfo.st, &htinfo.iCol, &htinfo.iRow); } else if(PtInRect(&infoPtr->calendars[calIdx].weeknums, lpht->pt)) { - lpht->uHit = MCHT_CALENDARWEEKNUM; - lpht->st.wYear = ht_month.wYear; + htinfo.uHit = MCHT_CALENDARWEEKNUM; + htinfo.st.wYear = ht_month.wYear; + htinfo.iOffset = calIdx; if (day < 1) { - lpht->st.wMonth = ht_month.wMonth - 1; - lpht->st.wDay = MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day; + htinfo.st.wMonth = ht_month.wMonth - 1; + htinfo.st.wDay = MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day; } else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) { - lpht->st.wMonth = ht_month.wMonth + 1; - lpht->st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); + htinfo.st.wMonth = ht_month.wMonth + 1; + htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); } else { - lpht->st.wMonth = ht_month.wMonth; - lpht->st.wDay = day; + htinfo.st.wMonth = ht_month.wMonth; + htinfo.st.wDay = day; } } else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { - lpht->st.wYear = ht_month.wYear; - lpht->st.wMonth = ht_month.wMonth; + htinfo.iOffset = calIdx; + htinfo.st.wYear = ht_month.wYear; + htinfo.st.wMonth = ht_month.wMonth; if (day < 1) { - lpht->uHit = MCHT_CALENDARDATEPREV; - MONTHCAL_GetPrevMonth(&lpht->st); - lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; + htinfo.uHit = MCHT_CALENDARDATEPREV; + MONTHCAL_GetPrevMonth(&htinfo.st); + htinfo.st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; } else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) { - lpht->uHit = MCHT_CALENDARDATENEXT; - MONTHCAL_GetNextMonth(&lpht->st); - lpht->st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); + htinfo.uHit = MCHT_CALENDARDATENEXT; + MONTHCAL_GetNextMonth(&htinfo.st); + htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); } - else { - lpht->uHit = MCHT_CALENDARDATE; - lpht->st.wDay = day; + else + { + htinfo.uHit = MCHT_CALENDARDATE; + htinfo.st.wDay = day; } + MONTHCAL_CalcDayXY(infoPtr, &htinfo.st, &htinfo.iCol, &htinfo.iRow); + MONTHCAL_CalcDayRect(infoPtr, &htinfo.rc, htinfo.iCol, htinfo.iRow); /* always update day of week */ - MONTHCAL_CalculateDayOfWeek(&lpht->st, TRUE); + MONTHCAL_CalculateDayOfWeek(&htinfo.st, TRUE); } - return lpht->uHit; + return fill_hittest_info(&htinfo, lpht); } /* MCN_GETDAYSTATE notification helper */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 59dd0d5..a522bd7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1698,7 +1698,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_CALENDARDATE, ret); - todo_wine expect(0, mchit.iOffset); + expect(0, mchit.iOffset); /* over day area */ mchit.pt.x = r.right / (7*2); @@ -1710,12 +1710,12 @@ static void test_hittest_v6(void) ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_CALENDARDATE, ret); expect_hex(MCHT_CALENDARDATE, mchit.uHit); - todo_wine expect(0, mchit.iOffset); - todo_wine expect(2, mchit.iRow); - todo_wine expect(0, mchit.iCol); + expect(0, mchit.iOffset); + expect(2, mchit.iRow); + expect(0, mchit.iCol); /* returned a one day rectangle */ - todo_wine expect_d(r.right / 7, mchit.rc.right - mchit.rc.left); - todo_wine expect_d(r.bottom / 10, mchit.rc.bottom - mchit.rc.top); + expect_d(r.right / 7, mchit.rc.right - mchit.rc.left); + expect_d(r.bottom / 10, mchit.rc.bottom - mchit.rc.top); /* title */ mchit.pt.x = 1; @@ -1727,13 +1727,13 @@ static void test_hittest_v6(void) ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_TITLE, ret); expect_hex(MCHT_TITLE, mchit.uHit); - todo_wine expect(0, mchit.iOffset); + expect(0, mchit.iOffset); expect(-1, mchit.iRow); expect(-1, mchit.iCol); - todo_wine expect(0, mchit.rc.left); - todo_wine expect(0, mchit.rc.top); - todo_wine expect_d(r.right, mchit.rc.right); - todo_wine ok(mchit.rc.bottom > 0, "got %d\n", mchit.rc.bottom); + expect(0, mchit.rc.left); + expect(0, mchit.rc.top); + expect_d(r.right, mchit.rc.right); + ok(mchit.rc.bottom > 0, "got %d\n", mchit.rc.bottom); /* between two calendars */ MoveWindow(hwnd, 0, 0, r.right * 5/2, r.bottom, FALSE); @@ -1741,7 +1741,7 @@ static void test_hittest_v6(void) mchit.pt.y = r.bottom / 2; mchit.iOffset = -2; mchit.iCol = mchit.iRow = -2; - mchit.uHit = 0; + mchit.uHit = ~0; mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); todo_wine expect_hex(MCHT_NOWHERE, ret);

1 0

Igor Paliychuk : shdocvw: Update Ukrainian translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 4afdeafe1ed531dbe3ec4f5dce69681a52502e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afdeafe1ed531dbe3ec4f5dc… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Aug 6 10:53:56 2010 +0300 shdocvw: Update Ukrainian translation. --- dlls/shdocvw/Uk.rc | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Uk.rc b/dlls/shdocvw/Uk.rc index 6af3f3b..f7c51e6 100644 --- a/dlls/shdocvw/Uk.rc +++ b/dlls/shdocvw/Uk.rc @@ -54,8 +54,36 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "В&ластивості...", ID_BROWSE_PROPERTIES } + POPUP "&Вигляд" + { + POPUP "&Панелі інструментів" + { + MENUITEM "&Стандартна панель" ID_BROWSE_BAR_STD + MENUITEM "Рядок &адреси" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Обране" + { + MENUITEM "&Додати до Обраного..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Довідка" { MENUITEM "&Про Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Назад" + IDS_TB_FORWARD "Вперед" + IDS_TB_STOP "Зупинити" + IDS_TB_REFRESH "Оновити" + IDS_TB_HOME "Додому" + IDS_TB_PRINT "Друк" +} + +STRINGTABLE +{ + IDS_ADDRESS "Адреса" +}

1 0

Łukasz Wojniłowicz : shdocvw: Add the Polish translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: c881dc274ab7d23e11e174ecba75e9664b9a4ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c881dc274ab7d23e11e174ecb… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Aug 5 07:00:00 2010 +0200 shdocvw: Add the Polish translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Pl.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30217f4..0459c92 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Pl.rc \ Ro.rc \ Sv.rc \ Uk.rc \ diff --git a/dlls/shdocvw/Pl.rc b/dlls/shdocvw/Pl.rc new file mode 100644 index 0000000..7a6ce31 --- /dev/null +++ b/dlls/shdocvw/Pl.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2010 �ukasz Wojni�owicz + * + * 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" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Otw�rz URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Podaj adres URL, kt�ry chcesz otworzy� w Internet Explorerze",-1,25, 5, 150,15 + LTEXT "Otw�rz:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Anuluj", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Plik" + { + POPUP "&Nowe" + { + MENUITEM "&Okno" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Otw�rz...", ID_BROWSE_OPEN + MENUITEM "&Zapisz", ID_BROWSE_SAVE + MENUITEM "Zapisz &jako...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Forma&t wydruku...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Drukuj...", ID_BROWSE_PRINT + MENUITEM "Podgl�&d wydruku...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&W�a�ciwo�ci...", ID_BROWSE_PROPERTIES + } + POPUP "&Pomoc" + { + MENUITEM "&O Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Anders Jonsson : setupapi: Update Swedish translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: daea0852d853a76306d4ed52207db90347967f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daea0852d853a76306d4ed522… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 10 11:06:22 2010 +0200 setupapi: Update Swedish translation. --- dlls/setupapi/Sv.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Sv.rc b/dlls/setupapi/Sv.rc index 414fb7f..5d6da23 100644 --- a/dlls/setupapi/Sv.rc +++ b/dlls/setupapi/Sv.rc @@ -22,6 +22,14 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_PROMPTDISK "Filen '%s' p� %s beh�vs" + IDS_UNKNOWN "Ok�nd" + IDS_COPYFROM "Kopiera filer fr�n:" + IDS_INFO "Skriv s�kv�gen d�r filen finns och klicka sedan OK." +} + COPYFILEDLGORD DIALOG 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Kopierar filer..." @@ -34,3 +42,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Filer beh�vs" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "S�tt i tillverkarens installationsdisk och\nkontrollera att r�tt disk �r vald nedan", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopiera tillverkarens filer fr�n:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bl�ddra...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Jörg Höhle : winecoreaudio: Use same hard-coded limit on frequency as ALSA/OSS.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 201c26530d3ca07bd8902295ef26a5b85c2e4edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=201c26530d3ca07bd8902295e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 22 08:51:45 2010 +0200 winecoreaudio: Use same hard-coded limit on frequency as ALSA/OSS. --- dlls/winecoreaudio.drv/audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 3f5cece..cf876ff 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -442,7 +442,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, static BOOL supportedFormat(LPWAVEFORMATEX wf) { - if (wf->nSamplesPerSec == 0) + if (wf->nSamplesPerSec < DSBFREQUENCY_MIN || wf->nSamplesPerSec > DSBFREQUENCY_MAX) return FALSE; if (wf->wFormatTag == WAVE_FORMAT_PCM) { @@ -464,7 +464,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) } else WARN("only KSDATAFORMAT_SUBTYPE_PCM supported\n"); } else - WARN("only WAVE_FORMAT_PCM supported\n"); + WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n"); return FALSE; }

1 0

Maarten Lankhorst : winmm: Fix fd leak on restarting timer.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 6910b0f1439b15d73783bcd276512a517fe8fd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6910b0f1439b15d73783bcd27… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 10 16:04:24 2010 +0200 winmm: Fix fd leak on restarting timer. --- dlls/winmm/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index e692fb6..e055f6b 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -243,16 +243,19 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) static void TIME_MMTimeStart(void) { TIME_TimeToDie = 0; - if (!TIME_hMMTimer) { - HMODULE mod; - if (pipe(TIME_fdWake) < 0) - { + + if (TIME_fdWake[0] < 0) { + if (pipe(TIME_fdWake) < 0) { TIME_fdWake[0] = TIME_fdWake[1] = -1; ERR("Cannot create pipe: %s\n", strerror(errno)); } else { fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); } + } + + if (!TIME_hMMTimer) { + HMODULE mod; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL);

1 0

Anders Jonsson : shdocvw: Update Swedish translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: e2806c3bcb685e0f2d79d5a0ddbe086b758a5306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2806c3bcb685e0f2d79d5a0d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 10 14:49:52 2010 +0200 shdocvw: Update Swedish translation. --- dlls/shdocvw/Sv.rc | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Sv.rc b/dlls/shdocvw/Sv.rc index 0bfa311..bf6e739 100644 --- a/dlls/shdocvw/Sv.rc +++ b/dlls/shdocvw/Sv.rc @@ -52,8 +52,36 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Egenskaper...", ID_BROWSE_PROPERTIES } + POPUP "&Visa" + { + POPUP "Verktygs&fält" + { + MENUITEM "&Standardfält" ID_BROWSE_BAR_STD + MENUITEM "&Adressfält" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoriter" + { + MENUITEM "&Lägg till favoriter..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Hjälp" { MENUITEM "&Om Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Bakåt" + IDS_TB_FORWARD "Framåt" + IDS_TB_STOP "Stopp" + IDS_TB_REFRESH "Uppdatera" + IDS_TB_HOME "Hem" + IDS_TB_PRINT "Skriv ut" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adress" +}

1 0

Yaron Shahrabani : clock: Updated Hebrew translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: a6c10df4367f37849e6f160705de17f64722f0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c10df4367f37849e6f16070… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Aug 5 09:05:10 2010 +0300 clock: Updated Hebrew translation. --- programs/clock/He.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/clock/He.rc b/programs/clock/He.rc index b22921b..68aebac 100644 --- a/programs/clock/He.rc +++ b/programs/clock/He.rc @@ -1,5 +1,5 @@ /* - * Clock (English resources) + * Clock (Hebrew resources) * * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> @@ -48,5 +48,5 @@ MAIN_MENU MENU STRINGTABLE { -IDS_CLOCK, "Clock" +IDS_CLOCK, "שעון" }

1 0

Anders Jonsson : wininet: Update Swedish translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 94d7111e8ae72ba008a07e25346f48416132c598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d7111e8ae72ba008a07e253… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 10 11:07:15 2010 +0200 wininet: Update Swedish translation. --- dlls/wininet/wininet_Sv.rc | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Sv.rc b/dlls/wininet/wininet_Sv.rc index ae7b492..520cdcb 100644 --- a/dlls/wininet/wininet_Sv.rc +++ b/dlls/wininet/wininet_Sv.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Ange ditt anv�ndarnamn och l�senord:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 LTEXT "Dom�n", -1, 40, 46, 50, 10 - LTEXT "Anv�ndarnamn", -1, 40, 66, 50, 10 + LTEXT "Anv�ndare", -1, 40, 66, 50, 10 LTEXT "L�senord", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 @@ -40,6 +40,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Autentisering kr�vs" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ange ditt anv�ndarnamn och l�senord:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Dom�n", -1, 40, 46, 50, 10 + LTEXT "Anv�ndare", -1, 40, 66, 50, 10 + LTEXT "L�senord", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Spara detta l�senord (os�kert)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "LAN-anslutning"

1 0