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

Nikolay Sivov : comctl32/monthcal: Properly adjust selections on scrolling.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 09d883fbf0e4b5b0605e1f4d9dd1090e72789437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d883fbf0e4b5b0605e1f4d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 11:56:06 2010 +0400 comctl32/monthcal: Properly adjust selections on scrolling. --- dlls/comctl32/monthcal.c | 57 +++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0b72603..7ca5633 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1820,6 +1820,39 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) } } +/* no valid range check performed */ +static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) +{ + INT i, selIdx = -1; + + for(i = 0; i < infoPtr->cal_num; i++) + { + /* save selection position to shift it later */ + if (selIdx == -1 && MONTHCAL_CompareMonths(&infoPtr->minSel, &infoPtr->calendars[i].month) == 0) + selIdx = i; + + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, delta); + } + + /* selection is always shifted to first calendar */ + if(infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME range[2]; + + MONTHCAL_GetSelRange(infoPtr, range); + MONTHCAL_GetMonth(&range[0], delta - selIdx); + MONTHCAL_GetMonth(&range[1], delta - selIdx); + MONTHCAL_SetSelRange(infoPtr, range); + } + else + { + SYSTEMTIME st = infoPtr->minSel; + + MONTHCAL_GetMonth(&st, delta - selIdx); + MONTHCAL_SetCurSel(infoPtr, &st); + } +} + static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { INT delta = infoPtr->delta ? infoPtr->delta : infoPtr->cal_num; @@ -1841,29 +1874,7 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; - if(infoPtr->dwStyle & MCS_MULTISELECT) - { - SYSTEMTIME range[2]; - - range[0] = infoPtr->minSel; - range[1] = infoPtr->maxSel; - - if(direction == DIRECTION_BACKWARD) - { - MONTHCAL_GetMonth(&range[0], -delta); - MONTHCAL_GetMonth(&range[1], -delta); - } - else - { - MONTHCAL_GetMonth(&range[0], delta); - MONTHCAL_GetMonth(&range[1], delta); - } - - MONTHCAL_SetSelRange(infoPtr, range); - } - else - MONTHCAL_SetCurSel(infoPtr, &st); - + MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); }

1 0

Nikolay Sivov : comctl32/monthcal: Make month popup menu respect multiple calendars.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 23d8d35e9e44dd1e3d330a8d9c034a9bc1890118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d8d35e9e44dd1e3d330a8d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 12:14:32 2010 +0400 comctl32/monthcal: Make month popup menu respect multiple calendars. --- 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 7ca5633..8425f67 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2046,11 +2046,23 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) i = TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); - if ((i > 0) && (i < 13) && infoPtr->minSel.wMonth != i) + if ((i > 0) && (i < 13) && infoPtr->calendars[ht.iOffset].month.wMonth != i) { - infoPtr->minSel.wMonth = i; - MONTHCAL_IsDateInValidRange(infoPtr, &infoPtr->minSel, TRUE); - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + INT delta = i - infoPtr->calendars[ht.iOffset].month.wMonth; + SYSTEMTIME st; + + /* check if change allowed by range set */ + st = delta < 0 ? infoPtr->calendars[0].month : + infoPtr->calendars[infoPtr->cal_num-1].month; + MONTHCAL_GetMonth(&st, delta); + + if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) + { + MONTHCAL_Scroll(infoPtr, delta); + MONTHCAL_NotifyDayState(infoPtr); + MONTHCAL_NotifySelectionChange(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + } } return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Properly scroll calendars on year change .
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: af6ba8297fc7c0615d0b5f30b4860af1eb4f93c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6ba8297fc7c0615d0b5f30b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 15:32:52 2010 +0400 comctl32/monthcal: Properly scroll calendars on year change. --- dlls/comctl32/monthcal.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8425f67..42f217c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -457,11 +457,10 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) /* add/substract 'months' from date */ static inline void MONTHCAL_GetMonth(SYSTEMTIME *date, INT months) { - INT length; + INT length, m = date->wMonth + months; - date->wMonth += months; - date->wYear += date->wMonth > 0 ? (date->wMonth - 1) / 12 : date->wMonth / 12 - 1; - date->wMonth = date->wMonth > 0 ? (date->wMonth - 1) % 12 + 1 : 12 + date->wMonth % 12; + date->wYear += m > 0 ? (m - 1) / 12 : m / 12 - 1; + date->wMonth = m > 0 ? (m - 1) % 12 + 1 : 12 + m % 12; /* fix moving from last day in a month */ length = MONTHCAL_MonthLength(date->wMonth, date->wYear); if(date->wDay > length) date->wDay = length; @@ -1957,12 +1956,15 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM } /* creates updown control and edit box */ -static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) +static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr, INT calIdx) { + RECT *rc = &infoPtr->calendars[calIdx].titleyear; + RECT *title = &infoPtr->calendars[calIdx].title; + infoPtr->hWndYearEdit = CreateWindowExW(0, WC_EDITW, 0, WS_VISIBLE | WS_CHILD | ES_READONLY, - infoPtr->calendars[0].titleyear.left + 3, infoPtr->titlebtnnext.top, - infoPtr->calendars[0].titleyear.right - infoPtr->calendars[0].titleyear.left + 4, + rc->left + 3, (title->bottom + title->top - infoPtr->textHeight) / 2, + rc->right - rc->left + 4, infoPtr->textHeight, infoPtr->hwndSelf, NULL, NULL, NULL); @@ -1971,7 +1973,7 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) infoPtr->hWndYearUpDown = CreateWindowExW(0, UPDOWN_CLASSW, 0, WS_VISIBLE | WS_CHILD | UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ARROWKEYS, - infoPtr->calendars[0].titleyear.right + 7, infoPtr->titlebtnnext.top, + rc->right + 7, (title->bottom + title->top - infoPtr->textHeight) / 2, 18, infoPtr->textHeight, infoPtr->hwndSelf, NULL, NULL, NULL); @@ -1979,7 +1981,7 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG(max_allowed_date.wYear, min_allowed_date.wYear)); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM)infoPtr->hWndYearEdit, 0); - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->minSel.wYear); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->calendars[calIdx].month.wYear); /* subclass edit box */ infoPtr->EditWndProc = (WNDPROC)SetWindowLongPtrW(infoPtr->hWndYearEdit, @@ -2068,7 +2070,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TITLEYEAR: { - MONTHCAL_EditYear(infoPtr); + MONTHCAL_EditYear(infoPtr, ht.iOffset); return 0; } case MCHT_TODAYLINK: @@ -2631,16 +2633,12 @@ MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) { NMUPDOWN *nmud = (NMUPDOWN*)hdr; - if (hdr->hwndFrom == infoPtr->hWndYearUpDown) + if (hdr->hwndFrom == infoPtr->hWndYearUpDown && nmud->iDelta) { /* year value limits are set up explicitly after updown creation */ - if ((nmud->iDelta + nmud->iPos) != infoPtr->minSel.wYear) - { - SYSTEMTIME new_date = infoPtr->minSel; - - new_date.wYear = nmud->iDelta + nmud->iPos; - MONTHCAL_SetCurSel(infoPtr, &new_date); - } + MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta); + MONTHCAL_NotifyDayState(infoPtr); + MONTHCAL_NotifySelectionChange(infoPtr); } } return 0;

1 0

Anders Jonsson : setupapi: Update Swedish translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

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

Anders Jonsson : wininet: Update Swedish translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

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

Anders Jonsson : mshtml: Update Swedish translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d3fd949c58902655726d9e74a54a4a46b96e7c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fd949c58902655726d9e74a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 10 14:49:17 2010 +0200 mshtml: Update Swedish translation. --- dlls/mshtml/Sv.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index 290fa75..7f3ab6d 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -22,6 +22,12 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE { + IDS_STATUS_DONE "Klar" + IDS_STATUS_DOWNLOADINGFROM "H�mtar fr�n %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "HTML-visning �r inte aktiverad." IDS_HTMLDOCUMENT "HTML-dokument" IDS_DOWNLOADING "H�mtar..."

1 0

Anders Jonsson : shdocvw: Update Swedish translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

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

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

16 Aug '10

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 16 Aug '10

16 Aug '10

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

Aurimas Fišeras : shdocvw: Updated Lithuanian translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: e72e645e5b7e02a5e7e79f2acbf5f6f5d4bfef11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72e645e5b7e02a5e7e79f2ac… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Aug 3 22:18:36 2010 +0300 shdocvw: Updated Lithuanian translation. --- dlls/shdocvw/Lt.rc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc index 16074b6..d2a5640 100644 --- a/dlls/shdocvw/Lt.rc +++ b/dlls/shdocvw/Lt.rc @@ -28,7 +28,7 @@ STYLE DS_MODALFRAME | WS_CAPTION CAPTION "Atverti URL" FONT 8, "MS Shell Dlg" { - LTEXT "Nurodykite URL, kurį norite atverti su interneto naršykle",-1,30, 5, 150,15 + LTEXT "Nurodykite URL, kurį norite atverti su interneto naršykle",-1 ,30, 5, 150, 16 LTEXT "Atverti:", -1, 2, 32, 25, 15 EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 160, 13 DEFPUSHBUTTON "&Gerai", IDOK, 30, 50, 50, 15 @@ -53,6 +53,14 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES } + POPUP "&Rodymas" + { + POPUP "&Įrankių juosta" + { + MENUITEM "Į&prastinė juosta" ID_BROWSE_BAR_STD + MENUITEM "&Adreso juosta" ID_BROWSE_BAR_ADDR + } + } POPUP "&Adresynas" { MENUITEM "Į&rašyti į adresyną..." ID_BROWSE_ADDFAV

1 0